indexedStringTable = transportAdapter.initializeStringTable(ind, stringTable);
- for(TransportRoute transportRoute : finishInit ) {
+ for (TransportRoute transportRoute : finishInit) {
transportAdapter.initializeNames(false, transportRoute, indexedStringTable);
}
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java b/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java
index 848f4b01c1..97a2abeb91 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java
@@ -12392,7 +12392,7 @@ public final class OsmandOdb {
* optional bytes labelcoordinates = 8;
*
*
- * pair x,y (sint32) of delta encoded to center of <coordinates> 31th zoom
+ * pair x,y (sint32) of delta encoded to center of <coordinates> 26th zoom
*
*/
boolean hasLabelcoordinates();
@@ -12400,7 +12400,7 @@ public final class OsmandOdb {
* optional bytes labelcoordinates = 8;
*
*
- * pair x,y (sint32) of delta encoded to center of <coordinates> 31th zoom
+ * pair x,y (sint32) of delta encoded to center of <coordinates> 26th zoom
*
*/
com.google.protobuf.ByteString getLabelcoordinates();
@@ -12715,7 +12715,7 @@ public final class OsmandOdb {
* optional bytes labelcoordinates = 8;
*
*
- * pair x,y (sint32) of delta encoded to center of <coordinates> 31th zoom
+ * pair x,y (sint32) of delta encoded to center of <coordinates> 26th zoom
*
*/
public boolean hasLabelcoordinates() {
@@ -12725,7 +12725,7 @@ public final class OsmandOdb {
* optional bytes labelcoordinates = 8;
*
*
- * pair x,y (sint32) of delta encoded to center of <coordinates> 31th zoom
+ * pair x,y (sint32) of delta encoded to center of <coordinates> 26th zoom
*
*/
public com.google.protobuf.ByteString getLabelcoordinates() {
@@ -13466,7 +13466,7 @@ public final class OsmandOdb {
* optional bytes labelcoordinates = 8;
*
*
- * pair x,y (sint32) of delta encoded to center of <coordinates> 31th zoom
+ * pair x,y (sint32) of delta encoded to center of <coordinates> 26th zoom
*
*/
public boolean hasLabelcoordinates() {
@@ -13476,7 +13476,7 @@ public final class OsmandOdb {
* optional bytes labelcoordinates = 8;
*
*
- * pair x,y (sint32) of delta encoded to center of <coordinates> 31th zoom
+ * pair x,y (sint32) of delta encoded to center of <coordinates> 26th zoom
*
*/
public com.google.protobuf.ByteString getLabelcoordinates() {
@@ -13486,7 +13486,7 @@ public final class OsmandOdb {
* optional bytes labelcoordinates = 8;
*
*
- * pair x,y (sint32) of delta encoded to center of <coordinates> 31th zoom
+ * pair x,y (sint32) of delta encoded to center of <coordinates> 26th zoom
*
*/
public Builder setLabelcoordinates(com.google.protobuf.ByteString value) {
@@ -13502,7 +13502,7 @@ public final class OsmandOdb {
* optional bytes labelcoordinates = 8;
*
*
- * pair x,y (sint32) of delta encoded to center of <coordinates> 31th zoom
+ * pair x,y (sint32) of delta encoded to center of <coordinates> 26th zoom
*
*/
public Builder clearLabelcoordinates() {
@@ -31943,6 +31943,1765 @@ public final class OsmandOdb {
// @@protoc_insertion_point(class_scope:OsmAnd.OBF.TransportRoute)
}
+ public interface IncompleteTransportRoutesOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ java.util.List
+ getRoutesList();
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute getRoutes(int index);
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ int getRoutesCount();
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ java.util.List extends net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder>
+ getRoutesOrBuilderList();
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder getRoutesOrBuilder(
+ int index);
+ }
+ /**
+ * Protobuf type {@code OsmAnd.OBF.IncompleteTransportRoutes}
+ */
+ public static final class IncompleteTransportRoutes extends
+ com.google.protobuf.GeneratedMessage
+ implements IncompleteTransportRoutesOrBuilder {
+ // Use IncompleteTransportRoutes.newBuilder() to construct.
+ private IncompleteTransportRoutes(com.google.protobuf.GeneratedMessage.Builder> builder) {
+ super(builder);
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private IncompleteTransportRoutes(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+ private static final IncompleteTransportRoutes defaultInstance;
+ public static IncompleteTransportRoutes getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public IncompleteTransportRoutes getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ private final com.google.protobuf.UnknownFieldSet unknownFields;
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private IncompleteTransportRoutes(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ initFields();
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 50: {
+ if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ routes_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000001;
+ }
+ routes_.add(input.readMessage(net.osmand.binary.OsmandOdb.IncompleteTransportRoute.PARSER, extensionRegistry));
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e.getMessage()).setUnfinishedMessage(this);
+ } finally {
+ if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+ routes_ = java.util.Collections.unmodifiableList(routes_);
+ }
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoutes_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoutes_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.class, net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder.class);
+ }
+
+ public static com.google.protobuf.Parser PARSER =
+ new com.google.protobuf.AbstractParser() {
+ public IncompleteTransportRoutes parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new IncompleteTransportRoutes(input, extensionRegistry);
+ }
+ };
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ // repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ public static final int ROUTES_FIELD_NUMBER = 6;
+ private java.util.List routes_;
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public java.util.List getRoutesList() {
+ return routes_;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public java.util.List extends net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder>
+ getRoutesOrBuilderList() {
+ return routes_;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public int getRoutesCount() {
+ return routes_.size();
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoute getRoutes(int index) {
+ return routes_.get(index);
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder getRoutesOrBuilder(
+ int index) {
+ return routes_.get(index);
+ }
+
+ private void initFields() {
+ routes_ = java.util.Collections.emptyList();
+ }
+ private byte memoizedIsInitialized = -1;
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ for (int i = 0; i < getRoutesCount(); i++) {
+ if (!getRoutes(i).isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ getSerializedSize();
+ for (int i = 0; i < routes_.size(); i++) {
+ output.writeMessage(6, routes_.get(i));
+ }
+ getUnknownFields().writeTo(output);
+ }
+
+ private int memoizedSerializedSize = -1;
+ public int getSerializedSize() {
+ int size = memoizedSerializedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ for (int i = 0; i < routes_.size(); i++) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(6, routes_.get(i));
+ }
+ size += getUnknownFields().getSerializedSize();
+ memoizedSerializedSize = size;
+ return size;
+ }
+
+ private static final long serialVersionUID = 0L;
+ @java.lang.Override
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
+ return super.writeReplace();
+ }
+
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input, extensionRegistry);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(net.osmand.binary.OsmandOdb.IncompleteTransportRoutes prototype) {
+ return newBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() { return newBuilder(this); }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code OsmAnd.OBF.IncompleteTransportRoutes}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.Builder
+ implements net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoutes_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoutes_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.class, net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder.class);
+ }
+
+ // Construct using net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getRoutesFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ if (routesBuilder_ == null) {
+ routes_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ } else {
+ routesBuilder_.clear();
+ }
+ return this;
+ }
+
+ public Builder clone() {
+ return create().mergeFrom(buildPartial());
+ }
+
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoutes_descriptor;
+ }
+
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes getDefaultInstanceForType() {
+ return net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.getDefaultInstance();
+ }
+
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes build() {
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes buildPartial() {
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes result = new net.osmand.binary.OsmandOdb.IncompleteTransportRoutes(this);
+ int from_bitField0_ = bitField0_;
+ if (routesBuilder_ == null) {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ routes_ = java.util.Collections.unmodifiableList(routes_);
+ bitField0_ = (bitField0_ & ~0x00000001);
+ }
+ result.routes_ = routes_;
+ } else {
+ result.routes_ = routesBuilder_.build();
+ }
+ onBuilt();
+ return result;
+ }
+
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof net.osmand.binary.OsmandOdb.IncompleteTransportRoutes) {
+ return mergeFrom((net.osmand.binary.OsmandOdb.IncompleteTransportRoutes)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(net.osmand.binary.OsmandOdb.IncompleteTransportRoutes other) {
+ if (other == net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.getDefaultInstance()) return this;
+ if (routesBuilder_ == null) {
+ if (!other.routes_.isEmpty()) {
+ if (routes_.isEmpty()) {
+ routes_ = other.routes_;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ } else {
+ ensureRoutesIsMutable();
+ routes_.addAll(other.routes_);
+ }
+ onChanged();
+ }
+ } else {
+ if (!other.routes_.isEmpty()) {
+ if (routesBuilder_.isEmpty()) {
+ routesBuilder_.dispose();
+ routesBuilder_ = null;
+ routes_ = other.routes_;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ routesBuilder_ =
+ com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+ getRoutesFieldBuilder() : null;
+ } else {
+ routesBuilder_.addAllMessages(other.routes_);
+ }
+ }
+ }
+ this.mergeUnknownFields(other.getUnknownFields());
+ return this;
+ }
+
+ public final boolean isInitialized() {
+ for (int i = 0; i < getRoutesCount(); i++) {
+ if (!getRoutes(i).isInitialized()) {
+
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (net.osmand.binary.OsmandOdb.IncompleteTransportRoutes) e.getUnfinishedMessage();
+ throw e;
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ // repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ private java.util.List routes_ =
+ java.util.Collections.emptyList();
+ private void ensureRoutesIsMutable() {
+ if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+ routes_ = new java.util.ArrayList(routes_);
+ bitField0_ |= 0x00000001;
+ }
+ }
+
+ private com.google.protobuf.RepeatedFieldBuilder<
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder, net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder> routesBuilder_;
+
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public java.util.List getRoutesList() {
+ if (routesBuilder_ == null) {
+ return java.util.Collections.unmodifiableList(routes_);
+ } else {
+ return routesBuilder_.getMessageList();
+ }
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public int getRoutesCount() {
+ if (routesBuilder_ == null) {
+ return routes_.size();
+ } else {
+ return routesBuilder_.getCount();
+ }
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoute getRoutes(int index) {
+ if (routesBuilder_ == null) {
+ return routes_.get(index);
+ } else {
+ return routesBuilder_.getMessage(index);
+ }
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder setRoutes(
+ int index, net.osmand.binary.OsmandOdb.IncompleteTransportRoute value) {
+ if (routesBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureRoutesIsMutable();
+ routes_.set(index, value);
+ onChanged();
+ } else {
+ routesBuilder_.setMessage(index, value);
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder setRoutes(
+ int index, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder builderForValue) {
+ if (routesBuilder_ == null) {
+ ensureRoutesIsMutable();
+ routes_.set(index, builderForValue.build());
+ onChanged();
+ } else {
+ routesBuilder_.setMessage(index, builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder addRoutes(net.osmand.binary.OsmandOdb.IncompleteTransportRoute value) {
+ if (routesBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureRoutesIsMutable();
+ routes_.add(value);
+ onChanged();
+ } else {
+ routesBuilder_.addMessage(value);
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder addRoutes(
+ int index, net.osmand.binary.OsmandOdb.IncompleteTransportRoute value) {
+ if (routesBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureRoutesIsMutable();
+ routes_.add(index, value);
+ onChanged();
+ } else {
+ routesBuilder_.addMessage(index, value);
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder addRoutes(
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder builderForValue) {
+ if (routesBuilder_ == null) {
+ ensureRoutesIsMutable();
+ routes_.add(builderForValue.build());
+ onChanged();
+ } else {
+ routesBuilder_.addMessage(builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder addRoutes(
+ int index, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder builderForValue) {
+ if (routesBuilder_ == null) {
+ ensureRoutesIsMutable();
+ routes_.add(index, builderForValue.build());
+ onChanged();
+ } else {
+ routesBuilder_.addMessage(index, builderForValue.build());
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder addAllRoutes(
+ java.lang.Iterable extends net.osmand.binary.OsmandOdb.IncompleteTransportRoute> values) {
+ if (routesBuilder_ == null) {
+ ensureRoutesIsMutable();
+ super.addAll(values, routes_);
+ onChanged();
+ } else {
+ routesBuilder_.addAllMessages(values);
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder clearRoutes() {
+ if (routesBuilder_ == null) {
+ routes_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ onChanged();
+ } else {
+ routesBuilder_.clear();
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public Builder removeRoutes(int index) {
+ if (routesBuilder_ == null) {
+ ensureRoutesIsMutable();
+ routes_.remove(index);
+ onChanged();
+ } else {
+ routesBuilder_.remove(index);
+ }
+ return this;
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder getRoutesBuilder(
+ int index) {
+ return getRoutesFieldBuilder().getBuilder(index);
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder getRoutesOrBuilder(
+ int index) {
+ if (routesBuilder_ == null) {
+ return routes_.get(index); } else {
+ return routesBuilder_.getMessageOrBuilder(index);
+ }
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public java.util.List extends net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder>
+ getRoutesOrBuilderList() {
+ if (routesBuilder_ != null) {
+ return routesBuilder_.getMessageOrBuilderList();
+ } else {
+ return java.util.Collections.unmodifiableList(routes_);
+ }
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder addRoutesBuilder() {
+ return getRoutesFieldBuilder().addBuilder(
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute.getDefaultInstance());
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder addRoutesBuilder(
+ int index) {
+ return getRoutesFieldBuilder().addBuilder(
+ index, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.getDefaultInstance());
+ }
+ /**
+ * repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+ */
+ public java.util.List
+ getRoutesBuilderList() {
+ return getRoutesFieldBuilder().getBuilderList();
+ }
+ private com.google.protobuf.RepeatedFieldBuilder<
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder, net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder>
+ getRoutesFieldBuilder() {
+ if (routesBuilder_ == null) {
+ routesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder, net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder>(
+ routes_,
+ ((bitField0_ & 0x00000001) == 0x00000001),
+ getParentForChildren(),
+ isClean());
+ routes_ = null;
+ }
+ return routesBuilder_;
+ }
+
+ // @@protoc_insertion_point(builder_scope:OsmAnd.OBF.IncompleteTransportRoutes)
+ }
+
+ static {
+ defaultInstance = new IncompleteTransportRoutes(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:OsmAnd.OBF.IncompleteTransportRoutes)
+ }
+
+ public interface IncompleteTransportRouteOrBuilder
+ extends com.google.protobuf.MessageOrBuilder {
+
+ // required uint64 id = 1;
+ /**
+ * required uint64 id = 1;
+ */
+ boolean hasId();
+ /**
+ * required uint64 id = 1;
+ */
+ long getId();
+
+ // optional uint32 type = 3;
+ /**
+ * optional uint32 type = 3;
+ *
+ *
+ * reference in string table
+ *
+ */
+ boolean hasType();
+ /**
+ * optional uint32 type = 3;
+ *
+ *
+ * reference in string table
+ *
+ */
+ int getType();
+
+ // optional uint32 operator = 4;
+ /**
+ * optional uint32 operator = 4;
+ *
+ *
+ * reference in string table
+ *
+ */
+ boolean hasOperator();
+ /**
+ * optional uint32 operator = 4;
+ *
+ *
+ * reference in string table
+ *
+ */
+ int getOperator();
+
+ // optional uint32 ref = 5;
+ /**
+ * optional uint32 ref = 5;
+ *
+ *
+ * reference in string table
+ *
+ */
+ boolean hasRef();
+ /**
+ * optional uint32 ref = 5;
+ *
+ *
+ * reference in string table
+ *
+ */
+ int getRef();
+
+ // required uint32 routeRef = 7;
+ /**
+ * required uint32 routeRef = 7;
+ *
+ *
+ * shift from OsmAndTransportIndex to the route in TransportRoute section
+ *
+ */
+ boolean hasRouteRef();
+ /**
+ * required uint32 routeRef = 7;
+ *
+ *
+ * shift from OsmAndTransportIndex to the route in TransportRoute section
+ *
+ */
+ int getRouteRef();
+
+ // repeated uint32 missingStops = 8;
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ java.util.List getMissingStopsList();
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ int getMissingStopsCount();
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ int getMissingStops(int index);
+ }
+ /**
+ * Protobuf type {@code OsmAnd.OBF.IncompleteTransportRoute}
+ */
+ public static final class IncompleteTransportRoute extends
+ com.google.protobuf.GeneratedMessage
+ implements IncompleteTransportRouteOrBuilder {
+ // Use IncompleteTransportRoute.newBuilder() to construct.
+ private IncompleteTransportRoute(com.google.protobuf.GeneratedMessage.Builder> builder) {
+ super(builder);
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private IncompleteTransportRoute(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+ private static final IncompleteTransportRoute defaultInstance;
+ public static IncompleteTransportRoute getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public IncompleteTransportRoute getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ private final com.google.protobuf.UnknownFieldSet unknownFields;
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private IncompleteTransportRoute(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ initFields();
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 8: {
+ bitField0_ |= 0x00000001;
+ id_ = input.readUInt64();
+ break;
+ }
+ case 24: {
+ bitField0_ |= 0x00000002;
+ type_ = input.readUInt32();
+ break;
+ }
+ case 32: {
+ bitField0_ |= 0x00000004;
+ operator_ = input.readUInt32();
+ break;
+ }
+ case 40: {
+ bitField0_ |= 0x00000008;
+ ref_ = input.readUInt32();
+ break;
+ }
+ case 56: {
+ bitField0_ |= 0x00000010;
+ routeRef_ = input.readUInt32();
+ break;
+ }
+ case 64: {
+ if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ missingStops_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000020;
+ }
+ missingStops_.add(input.readUInt32());
+ break;
+ }
+ case 66: {
+ int length = input.readRawVarint32();
+ int limit = input.pushLimit(length);
+ if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
+ missingStops_ = new java.util.ArrayList();
+ mutable_bitField0_ |= 0x00000020;
+ }
+ while (input.getBytesUntilLimit() > 0) {
+ missingStops_.add(input.readUInt32());
+ }
+ input.popLimit(limit);
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e.getMessage()).setUnfinishedMessage(this);
+ } finally {
+ if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+ missingStops_ = java.util.Collections.unmodifiableList(missingStops_);
+ }
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoute_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoute_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute.class, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder.class);
+ }
+
+ public static com.google.protobuf.Parser PARSER =
+ new com.google.protobuf.AbstractParser() {
+ public IncompleteTransportRoute parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new IncompleteTransportRoute(input, extensionRegistry);
+ }
+ };
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ private int bitField0_;
+ // required uint64 id = 1;
+ public static final int ID_FIELD_NUMBER = 1;
+ private long id_;
+ /**
+ * required uint64 id = 1;
+ */
+ public boolean hasId() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * required uint64 id = 1;
+ */
+ public long getId() {
+ return id_;
+ }
+
+ // optional uint32 type = 3;
+ public static final int TYPE_FIELD_NUMBER = 3;
+ private int type_;
+ /**
+ * optional uint32 type = 3;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional uint32 type = 3;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public int getType() {
+ return type_;
+ }
+
+ // optional uint32 operator = 4;
+ public static final int OPERATOR_FIELD_NUMBER = 4;
+ private int operator_;
+ /**
+ * optional uint32 operator = 4;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public boolean hasOperator() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * optional uint32 operator = 4;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public int getOperator() {
+ return operator_;
+ }
+
+ // optional uint32 ref = 5;
+ public static final int REF_FIELD_NUMBER = 5;
+ private int ref_;
+ /**
+ * optional uint32 ref = 5;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public boolean hasRef() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional uint32 ref = 5;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public int getRef() {
+ return ref_;
+ }
+
+ // required uint32 routeRef = 7;
+ public static final int ROUTEREF_FIELD_NUMBER = 7;
+ private int routeRef_;
+ /**
+ * required uint32 routeRef = 7;
+ *
+ *
+ * shift from OsmAndTransportIndex to the route in TransportRoute section
+ *
+ */
+ public boolean hasRouteRef() {
+ return ((bitField0_ & 0x00000010) == 0x00000010);
+ }
+ /**
+ * required uint32 routeRef = 7;
+ *
+ *
+ * shift from OsmAndTransportIndex to the route in TransportRoute section
+ *
+ */
+ public int getRouteRef() {
+ return routeRef_;
+ }
+
+ // repeated uint32 missingStops = 8;
+ public static final int MISSINGSTOPS_FIELD_NUMBER = 8;
+ private java.util.List missingStops_;
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public java.util.List
+ getMissingStopsList() {
+ return missingStops_;
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public int getMissingStopsCount() {
+ return missingStops_.size();
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public int getMissingStops(int index) {
+ return missingStops_.get(index);
+ }
+
+ private void initFields() {
+ id_ = 0L;
+ type_ = 0;
+ operator_ = 0;
+ ref_ = 0;
+ routeRef_ = 0;
+ missingStops_ = java.util.Collections.emptyList();
+ }
+ private byte memoizedIsInitialized = -1;
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasId()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasRouteRef()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ getSerializedSize();
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeUInt64(1, id_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeUInt32(3, type_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeUInt32(4, operator_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeUInt32(5, ref_);
+ }
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ output.writeUInt32(7, routeRef_);
+ }
+ for (int i = 0; i < missingStops_.size(); i++) {
+ output.writeUInt32(8, missingStops_.get(i));
+ }
+ getUnknownFields().writeTo(output);
+ }
+
+ private int memoizedSerializedSize = -1;
+ public int getSerializedSize() {
+ int size = memoizedSerializedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt64Size(1, id_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(3, type_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(4, operator_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(5, ref_);
+ }
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeUInt32Size(7, routeRef_);
+ }
+ {
+ int dataSize = 0;
+ for (int i = 0; i < missingStops_.size(); i++) {
+ dataSize += com.google.protobuf.CodedOutputStream
+ .computeUInt32SizeNoTag(missingStops_.get(i));
+ }
+ size += dataSize;
+ size += 1 * getMissingStopsList().size();
+ }
+ size += getUnknownFields().getSerializedSize();
+ memoizedSerializedSize = size;
+ return size;
+ }
+
+ private static final long serialVersionUID = 0L;
+ @java.lang.Override
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
+ return super.writeReplace();
+ }
+
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input, extensionRegistry);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static net.osmand.binary.OsmandOdb.IncompleteTransportRoute parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(net.osmand.binary.OsmandOdb.IncompleteTransportRoute prototype) {
+ return newBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() { return newBuilder(this); }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code OsmAnd.OBF.IncompleteTransportRoute}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.Builder
+ implements net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoute_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoute_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute.class, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder.class);
+ }
+
+ // Construct using net.osmand.binary.OsmandOdb.IncompleteTransportRoute.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ }
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ id_ = 0L;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ type_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ operator_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ ref_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000008);
+ routeRef_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000010);
+ missingStops_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000020);
+ return this;
+ }
+
+ public Builder clone() {
+ return create().mergeFrom(buildPartial());
+ }
+
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return net.osmand.binary.OsmandOdb.internal_static_OsmAnd_OBF_IncompleteTransportRoute_descriptor;
+ }
+
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoute getDefaultInstanceForType() {
+ return net.osmand.binary.OsmandOdb.IncompleteTransportRoute.getDefaultInstance();
+ }
+
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoute build() {
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoute buildPartial() {
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute result = new net.osmand.binary.OsmandOdb.IncompleteTransportRoute(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.id_ = id_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.type_ = type_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.operator_ = operator_;
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ result.ref_ = ref_;
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ to_bitField0_ |= 0x00000010;
+ }
+ result.routeRef_ = routeRef_;
+ if (((bitField0_ & 0x00000020) == 0x00000020)) {
+ missingStops_ = java.util.Collections.unmodifiableList(missingStops_);
+ bitField0_ = (bitField0_ & ~0x00000020);
+ }
+ result.missingStops_ = missingStops_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof net.osmand.binary.OsmandOdb.IncompleteTransportRoute) {
+ return mergeFrom((net.osmand.binary.OsmandOdb.IncompleteTransportRoute)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(net.osmand.binary.OsmandOdb.IncompleteTransportRoute other) {
+ if (other == net.osmand.binary.OsmandOdb.IncompleteTransportRoute.getDefaultInstance()) return this;
+ if (other.hasId()) {
+ setId(other.getId());
+ }
+ if (other.hasType()) {
+ setType(other.getType());
+ }
+ if (other.hasOperator()) {
+ setOperator(other.getOperator());
+ }
+ if (other.hasRef()) {
+ setRef(other.getRef());
+ }
+ if (other.hasRouteRef()) {
+ setRouteRef(other.getRouteRef());
+ }
+ if (!other.missingStops_.isEmpty()) {
+ if (missingStops_.isEmpty()) {
+ missingStops_ = other.missingStops_;
+ bitField0_ = (bitField0_ & ~0x00000020);
+ } else {
+ ensureMissingStopsIsMutable();
+ missingStops_.addAll(other.missingStops_);
+ }
+ onChanged();
+ }
+ this.mergeUnknownFields(other.getUnknownFields());
+ return this;
+ }
+
+ public final boolean isInitialized() {
+ if (!hasId()) {
+
+ return false;
+ }
+ if (!hasRouteRef()) {
+
+ return false;
+ }
+ return true;
+ }
+
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoute parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (net.osmand.binary.OsmandOdb.IncompleteTransportRoute) e.getUnfinishedMessage();
+ throw e;
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ // required uint64 id = 1;
+ private long id_ ;
+ /**
+ * required uint64 id = 1;
+ */
+ public boolean hasId() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * required uint64 id = 1;
+ */
+ public long getId() {
+ return id_;
+ }
+ /**
+ * required uint64 id = 1;
+ */
+ public Builder setId(long value) {
+ bitField0_ |= 0x00000001;
+ id_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * required uint64 id = 1;
+ */
+ public Builder clearId() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ id_ = 0L;
+ onChanged();
+ return this;
+ }
+
+ // optional uint32 type = 3;
+ private int type_ ;
+ /**
+ * optional uint32 type = 3;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * optional uint32 type = 3;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public int getType() {
+ return type_;
+ }
+ /**
+ * optional uint32 type = 3;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public Builder setType(int value) {
+ bitField0_ |= 0x00000002;
+ type_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional uint32 type = 3;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public Builder clearType() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ type_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // optional uint32 operator = 4;
+ private int operator_ ;
+ /**
+ * optional uint32 operator = 4;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public boolean hasOperator() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * optional uint32 operator = 4;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public int getOperator() {
+ return operator_;
+ }
+ /**
+ * optional uint32 operator = 4;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public Builder setOperator(int value) {
+ bitField0_ |= 0x00000004;
+ operator_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional uint32 operator = 4;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public Builder clearOperator() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ operator_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // optional uint32 ref = 5;
+ private int ref_ ;
+ /**
+ * optional uint32 ref = 5;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public boolean hasRef() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional uint32 ref = 5;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public int getRef() {
+ return ref_;
+ }
+ /**
+ * optional uint32 ref = 5;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public Builder setRef(int value) {
+ bitField0_ |= 0x00000008;
+ ref_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional uint32 ref = 5;
+ *
+ *
+ * reference in string table
+ *
+ */
+ public Builder clearRef() {
+ bitField0_ = (bitField0_ & ~0x00000008);
+ ref_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // required uint32 routeRef = 7;
+ private int routeRef_ ;
+ /**
+ * required uint32 routeRef = 7;
+ *
+ *
+ * shift from OsmAndTransportIndex to the route in TransportRoute section
+ *
+ */
+ public boolean hasRouteRef() {
+ return ((bitField0_ & 0x00000010) == 0x00000010);
+ }
+ /**
+ * required uint32 routeRef = 7;
+ *
+ *
+ * shift from OsmAndTransportIndex to the route in TransportRoute section
+ *
+ */
+ public int getRouteRef() {
+ return routeRef_;
+ }
+ /**
+ * required uint32 routeRef = 7;
+ *
+ *
+ * shift from OsmAndTransportIndex to the route in TransportRoute section
+ *
+ */
+ public Builder setRouteRef(int value) {
+ bitField0_ |= 0x00000010;
+ routeRef_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * required uint32 routeRef = 7;
+ *
+ *
+ * shift from OsmAndTransportIndex to the route in TransportRoute section
+ *
+ */
+ public Builder clearRouteRef() {
+ bitField0_ = (bitField0_ & ~0x00000010);
+ routeRef_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // repeated uint32 missingStops = 8;
+ private java.util.List missingStops_ = java.util.Collections.emptyList();
+ private void ensureMissingStopsIsMutable() {
+ if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+ missingStops_ = new java.util.ArrayList(missingStops_);
+ bitField0_ |= 0x00000020;
+ }
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public java.util.List
+ getMissingStopsList() {
+ return java.util.Collections.unmodifiableList(missingStops_);
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public int getMissingStopsCount() {
+ return missingStops_.size();
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public int getMissingStops(int index) {
+ return missingStops_.get(index);
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public Builder setMissingStops(
+ int index, int value) {
+ ensureMissingStopsIsMutable();
+ missingStops_.set(index, value);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public Builder addMissingStops(int value) {
+ ensureMissingStopsIsMutable();
+ missingStops_.add(value);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public Builder addAllMissingStops(
+ java.lang.Iterable extends java.lang.Integer> values) {
+ ensureMissingStopsIsMutable();
+ super.addAll(values, missingStops_);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated uint32 missingStops = 8;
+ *
+ *
+ * shift from OsmAndTransportIndex to stops that are missing
+ *
+ */
+ public Builder clearMissingStops() {
+ missingStops_ = java.util.Collections.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000020);
+ onChanged();
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:OsmAnd.OBF.IncompleteTransportRoute)
+ }
+
+ static {
+ defaultInstance = new IncompleteTransportRoute(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:OsmAnd.OBF.IncompleteTransportRoute)
+ }
+
public interface TransportRouteScheduleOrBuilder
extends com.google.protobuf.MessageOrBuilder {
@@ -40233,6 +41992,20 @@ public final class OsmandOdb {
*/
net.osmand.binary.OsmandOdb.TransportStopsTreeOrBuilder getStopsOrBuilder();
+ // optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ boolean hasIncompleteRoutes();
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes getIncompleteRoutes();
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder getIncompleteRoutesOrBuilder();
+
// required .OsmAnd.OBF.StringTable stringTable = 9;
/**
* required .OsmAnd.OBF.StringTable stringTable = 9;
@@ -40329,9 +42102,22 @@ public final class OsmandOdb {
bitField0_ |= 0x00000004;
break;
}
+ case 66: {
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ subBuilder = incompleteRoutes_.toBuilder();
+ }
+ incompleteRoutes_ = input.readMessage(net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(incompleteRoutes_);
+ incompleteRoutes_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000008;
+ break;
+ }
case 74: {
net.osmand.binary.OsmandOdb.StringTable.Builder subBuilder = null;
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
subBuilder = stringTable_.toBuilder();
}
stringTable_ = input.readMessage(net.osmand.binary.OsmandOdb.StringTable.PARSER, extensionRegistry);
@@ -40339,7 +42125,7 @@ public final class OsmandOdb {
subBuilder.mergeFrom(stringTable_);
stringTable_ = subBuilder.buildPartial();
}
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
break;
}
}
@@ -40493,6 +42279,28 @@ public final class OsmandOdb {
return stops_;
}
+ // optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ public static final int INCOMPLETEROUTES_FIELD_NUMBER = 8;
+ private net.osmand.binary.OsmandOdb.IncompleteTransportRoutes incompleteRoutes_;
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public boolean hasIncompleteRoutes() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes getIncompleteRoutes() {
+ return incompleteRoutes_;
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder getIncompleteRoutesOrBuilder() {
+ return incompleteRoutes_;
+ }
+
// required .OsmAnd.OBF.StringTable stringTable = 9;
public static final int STRINGTABLE_FIELD_NUMBER = 9;
private net.osmand.binary.OsmandOdb.StringTable stringTable_;
@@ -40500,7 +42308,7 @@ public final class OsmandOdb {
* required .OsmAnd.OBF.StringTable stringTable = 9;
*/
public boolean hasStringTable() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* required .OsmAnd.OBF.StringTable stringTable = 9;
@@ -40519,6 +42327,7 @@ public final class OsmandOdb {
name_ = "";
routes_ = net.osmand.binary.OsmandOdb.TransportRoutes.getDefaultInstance();
stops_ = net.osmand.binary.OsmandOdb.TransportStopsTree.getDefaultInstance();
+ incompleteRoutes_ = net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.getDefaultInstance();
stringTable_ = net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
@@ -40542,6 +42351,12 @@ public final class OsmandOdb {
return false;
}
}
+ if (hasIncompleteRoutes()) {
+ if (!getIncompleteRoutes().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -40559,6 +42374,9 @@ public final class OsmandOdb {
output.writeMessage(6, stops_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeMessage(8, incompleteRoutes_);
+ }
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeMessage(9, stringTable_);
}
getUnknownFields().writeTo(output);
@@ -40583,6 +42401,10 @@ public final class OsmandOdb {
.computeMessageSize(6, stops_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(8, incompleteRoutes_);
+ }
+ if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(9, stringTable_);
}
@@ -40696,6 +42518,7 @@ public final class OsmandOdb {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getRoutesFieldBuilder();
getStopsFieldBuilder();
+ getIncompleteRoutesFieldBuilder();
getStringTableFieldBuilder();
}
}
@@ -40719,12 +42542,18 @@ public final class OsmandOdb {
stopsBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000004);
+ if (incompleteRoutesBuilder_ == null) {
+ incompleteRoutes_ = net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.getDefaultInstance();
+ } else {
+ incompleteRoutesBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
if (stringTableBuilder_ == null) {
stringTable_ = net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance();
} else {
stringTableBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -40776,6 +42605,14 @@ public final class OsmandOdb {
if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
to_bitField0_ |= 0x00000008;
}
+ if (incompleteRoutesBuilder_ == null) {
+ result.incompleteRoutes_ = incompleteRoutes_;
+ } else {
+ result.incompleteRoutes_ = incompleteRoutesBuilder_.build();
+ }
+ if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+ to_bitField0_ |= 0x00000010;
+ }
if (stringTableBuilder_ == null) {
result.stringTable_ = stringTable_;
} else {
@@ -40808,6 +42645,9 @@ public final class OsmandOdb {
if (other.hasStops()) {
mergeStops(other.getStops());
}
+ if (other.hasIncompleteRoutes()) {
+ mergeIncompleteRoutes(other.getIncompleteRoutes());
+ }
if (other.hasStringTable()) {
mergeStringTable(other.getStringTable());
}
@@ -40832,6 +42672,12 @@ public final class OsmandOdb {
return false;
}
}
+ if (hasIncompleteRoutes()) {
+ if (!getIncompleteRoutes().isInitialized()) {
+
+ return false;
+ }
+ }
return true;
}
@@ -41234,6 +43080,123 @@ public final class OsmandOdb {
return stopsBuilder_;
}
+ // optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ private net.osmand.binary.OsmandOdb.IncompleteTransportRoutes incompleteRoutes_ = net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes, net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder, net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder> incompleteRoutesBuilder_;
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public boolean hasIncompleteRoutes() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes getIncompleteRoutes() {
+ if (incompleteRoutesBuilder_ == null) {
+ return incompleteRoutes_;
+ } else {
+ return incompleteRoutesBuilder_.getMessage();
+ }
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public Builder setIncompleteRoutes(net.osmand.binary.OsmandOdb.IncompleteTransportRoutes value) {
+ if (incompleteRoutesBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ incompleteRoutes_ = value;
+ onChanged();
+ } else {
+ incompleteRoutesBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public Builder setIncompleteRoutes(
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder builderForValue) {
+ if (incompleteRoutesBuilder_ == null) {
+ incompleteRoutes_ = builderForValue.build();
+ onChanged();
+ } else {
+ incompleteRoutesBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public Builder mergeIncompleteRoutes(net.osmand.binary.OsmandOdb.IncompleteTransportRoutes value) {
+ if (incompleteRoutesBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ incompleteRoutes_ != net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.getDefaultInstance()) {
+ incompleteRoutes_ =
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.newBuilder(incompleteRoutes_).mergeFrom(value).buildPartial();
+ } else {
+ incompleteRoutes_ = value;
+ }
+ onChanged();
+ } else {
+ incompleteRoutesBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public Builder clearIncompleteRoutes() {
+ if (incompleteRoutesBuilder_ == null) {
+ incompleteRoutes_ = net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.getDefaultInstance();
+ onChanged();
+ } else {
+ incompleteRoutesBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder getIncompleteRoutesBuilder() {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ return getIncompleteRoutesFieldBuilder().getBuilder();
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ public net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder getIncompleteRoutesOrBuilder() {
+ if (incompleteRoutesBuilder_ != null) {
+ return incompleteRoutesBuilder_.getMessageOrBuilder();
+ } else {
+ return incompleteRoutes_;
+ }
+ }
+ /**
+ * optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes, net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder, net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder>
+ getIncompleteRoutesFieldBuilder() {
+ if (incompleteRoutesBuilder_ == null) {
+ incompleteRoutesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ net.osmand.binary.OsmandOdb.IncompleteTransportRoutes, net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder, net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder>(
+ incompleteRoutes_,
+ getParentForChildren(),
+ isClean());
+ incompleteRoutes_ = null;
+ }
+ return incompleteRoutesBuilder_;
+ }
+
// required .OsmAnd.OBF.StringTable stringTable = 9;
private net.osmand.binary.OsmandOdb.StringTable stringTable_ = net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
@@ -41242,7 +43205,7 @@ public final class OsmandOdb {
* required .OsmAnd.OBF.StringTable stringTable = 9;
*/
public boolean hasStringTable() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
+ return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* required .OsmAnd.OBF.StringTable stringTable = 9;
@@ -41267,7 +43230,7 @@ public final class OsmandOdb {
} else {
stringTableBuilder_.setMessage(value);
}
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -41281,7 +43244,7 @@ public final class OsmandOdb {
} else {
stringTableBuilder_.setMessage(builderForValue.build());
}
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -41289,7 +43252,7 @@ public final class OsmandOdb {
*/
public Builder mergeStringTable(net.osmand.binary.OsmandOdb.StringTable value) {
if (stringTableBuilder_ == null) {
- if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ if (((bitField0_ & 0x00000010) == 0x00000010) &&
stringTable_ != net.osmand.binary.OsmandOdb.StringTable.getDefaultInstance()) {
stringTable_ =
net.osmand.binary.OsmandOdb.StringTable.newBuilder(stringTable_).mergeFrom(value).buildPartial();
@@ -41300,7 +43263,7 @@ public final class OsmandOdb {
} else {
stringTableBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
return this;
}
/**
@@ -41313,14 +43276,14 @@ public final class OsmandOdb {
} else {
stringTableBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000008);
+ bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
/**
* required .OsmAnd.OBF.StringTable stringTable = 9;
*/
public net.osmand.binary.OsmandOdb.StringTable.Builder getStringTableBuilder() {
- bitField0_ |= 0x00000008;
+ bitField0_ |= 0x00000010;
onChanged();
return getStringTableFieldBuilder().getBuilder();
}
@@ -62742,6 +64705,16 @@ public final class OsmandOdb {
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_OsmAnd_OBF_TransportRoute_fieldAccessorTable;
+ private static com.google.protobuf.Descriptors.Descriptor
+ internal_static_OsmAnd_OBF_IncompleteTransportRoutes_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_OsmAnd_OBF_IncompleteTransportRoutes_fieldAccessorTable;
+ private static com.google.protobuf.Descriptors.Descriptor
+ internal_static_OsmAnd_OBF_IncompleteTransportRoute_descriptor;
+ private static
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internal_static_OsmAnd_OBF_IncompleteTransportRoute_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
internal_static_OsmAnd_OBF_TransportRouteSchedule_descriptor;
private static
@@ -62969,96 +64942,103 @@ public final class OsmandOdb {
"TransportRouteStop\0224\n\014reverseStops\030\020 \003(\013" +
"2\036.OsmAnd.OBF.TransportRouteStop\022\020\n\010geom" +
"etry\030\021 \001(\014\0228\n\014scheduleTrip\030\022 \003(\0132\".OsmAn" +
- "d.OBF.TransportRouteSchedule\"\244\001\n\026Transpo" +
- "rtRouteSchedule\022\030\n\020avgStopIntervals\030\001 \001(" +
- "\014\022\030\n\020avgWaitIntervals\030\002 \001(\014\022\025\n\rtripInter" +
- "vals\030\003 \001(\014\022?\n\nexceptions\030\010 \003(\0132+.OsmAnd." +
- "OBF.TransportRouteScheduleException\"\313\001\n\037" +
- "TransportRouteScheduleException\022\023\n\013tripI" +
- "ndexes\030\001 \003(\r\022\023\n\013stopIndexes\030\002 \003(\r\022\021\n\tava",
- "ilable\030\003 \001(\010\022\024\n\014delayArrival\030\005 \003(\r\022\031\n\021de" +
- "ltaWaitInterval\030\006 \003(\005\022\034\n\024dayOfWeekRestri" +
- "ction\030\007 \003(\r\022\034\n\024dayOfYearRestriction\030\010 \003(" +
- "\r\"W\n\022TransportRouteStop\022\n\n\002id\030\001 \002(\022\022\n\n\002d" +
- "x\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\014\n\004name\030\006 \002(\r\022\017\n\007nam" +
- "e_en\030\007 \001(\r\"\332\001\n\rTransportStop\022\n\n\002dx\030\001 \002(\021" +
- "\022\n\n\002dy\030\002 \002(\021\022\n\n\002id\030\005 \002(\022\022\014\n\004name\030\006 \002(\r\022\017" +
- "\n\007name_en\030\007 \001(\r\022\033\n\023additionalNamePairs\030\010" +
- " \001(\014\022,\n\005exits\030\t \003(\0132\035.OsmAnd.OBF.Transpo" +
- "rtStopExit\022\016\n\006routes\030\020 \003(\r\022\030\n\020deletedRou",
- "tesIds\030\024 \003(\004\022\021\n\troutesIds\030\026 \003(\004\"8\n\021Trans" +
- "portStopExit\022\n\n\002dx\030\001 \002(\021\022\n\n\002dy\030\002 \002(\021\022\013\n\003" +
- "ref\030\003 \002(\r\"\272\001\n\022TransportStopsTree\022\014\n\004left" +
- "\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bo" +
- "ttom\030\004 \002(\021\0220\n\010subtrees\030\007 \003(\0132\036.OsmAnd.OB" +
- "F.TransportStopsTree\022(\n\005leafs\030\010 \003(\0132\031.Os" +
- "mAnd.OBF.TransportStop\022\016\n\006baseId\030\020 \001(\004\"\256" +
- "\001\n\024OsmAndTransportIndex\022\014\n\004name\030\001 \001(\t\022+\n" +
- "\006routes\030\003 \001(\0132\033.OsmAnd.OBF.TransportRout" +
- "es\022-\n\005stops\030\006 \001(\0132\036.OsmAnd.OBF.Transport",
- "StopsTree\022,\n\013stringTable\030\t \002(\0132\027.OsmAnd." +
- "OBF.StringTable\"\312\002\n\016OsmAndPoiIndex\022\014\n\004na" +
- "me\030\001 \002(\t\022-\n\nboundaries\030\002 \002(\0132\031.OsmAnd.OB" +
- "F.OsmAndTileBox\0228\n\017categoriesTable\030\003 \003(\013" +
- "2\037.OsmAnd.OBF.OsmAndCategoryTable\0221\n\tnam" +
- "eIndex\030\004 \001(\0132\036.OsmAnd.OBF.OsmAndPoiNameI" +
- "ndex\0226\n\rsubtypesTable\030\005 \001(\0132\037.OsmAnd.OBF" +
- ".OsmAndSubtypesTable\022\'\n\005boxes\030\006 \003(\0132\030.Os" +
- "mAnd.OBF.OsmAndPoiBox\022-\n\007poiData\030\t \003(\0132\034" +
- ".OsmAnd.OBF.OsmAndPoiBoxData\"\331\001\n\022OsmAndP",
- "oiNameIndex\022-\n\005table\030\003 \002(\0132\036.OsmAnd.OBF." +
- "IndexedStringTable\022C\n\004data\030\005 \003(\01325.OsmAn" +
- "d.OBF.OsmAndPoiNameIndex.OsmAndPoiNameIn" +
- "dexData\032O\n\026OsmAndPoiNameIndexData\0225\n\005ato" +
- "ms\030\003 \003(\0132&.OsmAnd.OBF.OsmAndPoiNameIndex" +
- "DataAtom\"Q\n\032OsmAndPoiNameIndexDataAtom\022\014" +
- "\n\004zoom\030\002 \001(\r\022\t\n\001x\030\003 \001(\r\022\t\n\001y\030\004 \001(\r\022\017\n\007sh" +
- "iftTo\030\016 \001(\007\">\n\023OsmAndCategoryTable\022\020\n\010ca" +
- "tegory\030\001 \002(\t\022\025\n\rsubcategories\030\003 \003(\t\"E\n\023O" +
- "smAndSubtypesTable\022.\n\010subtypes\030\004 \003(\0132\034.O",
- "smAnd.OBF.OsmAndPoiSubtype\"\205\001\n\020OsmAndPoi" +
- "Subtype\022\014\n\004name\030\001 \002(\t\022\017\n\007tagname\030\002 \001(\t\022\016" +
- "\n\006isText\030\003 \002(\010\022\021\n\tfrequency\030\005 \001(\r\022\031\n\021sub" +
- "typeValuesSize\030\006 \001(\r\022\024\n\014subtypeValue\030\010 \003" +
- "(\t\"\255\001\n\014OsmAndPoiBox\022\014\n\004zoom\030\001 \002(\r\022\014\n\004lef" +
- "t\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\0223\n\ncategories\030\004 \001(\013" +
- "2\037.OsmAnd.OBF.OsmAndPoiCategories\022*\n\010sub" +
- "Boxes\030\n \003(\0132\030.OsmAnd.OBF.OsmAndPoiBox\022\023\n" +
- "\013shiftToData\030\016 \001(\007\"@\n\023OsmAndPoiCategorie" +
- "s\022\022\n\ncategories\030\003 \003(\r\022\025\n\rsubcategories\030\005",
- " \003(\r\"i\n\020OsmAndPoiBoxData\022\014\n\004zoom\030\001 \001(\r\022\t" +
- "\n\001x\030\002 \001(\r\022\t\n\001y\030\003 \001(\r\0221\n\007poiData\030\005 \003(\0132 ." +
- "OsmAnd.OBF.OsmAndPoiBoxDataAtom\"\360\001\n\024OsmA" +
- "ndPoiBoxDataAtom\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021" +
- "\022\022\n\ncategories\030\004 \003(\r\022\025\n\rsubcategories\030\005 " +
- "\003(\r\022\014\n\004name\030\006 \001(\t\022\016\n\006nameEn\030\007 \001(\t\022\n\n\002id\030" +
- "\010 \001(\004\022\024\n\014openingHours\030\n \001(\t\022\014\n\004site\030\013 \001(" +
- "\t\022\r\n\005phone\030\014 \001(\t\022\014\n\004note\030\r \001(\t\022\026\n\016textCa" +
- "tegories\030\016 \003(\r\022\022\n\ntextValues\030\017 \003(\t\"\032\n\007Id" +
- "Table\022\017\n\007routeId\030\001 \003(\022\"F\n\017RestrictionDat",
- "a\022\014\n\004type\030\001 \002(\005\022\014\n\004from\030\002 \002(\005\022\n\n\002to\030\003 \002(" +
- "\005\022\013\n\003via\030\004 \001(\005\"x\n\tRouteData\022\016\n\006points\030\001 " +
- "\002(\014\022\022\n\npointTypes\030\004 \001(\014\022\022\n\npointNames\030\005 " +
- "\001(\014\022\r\n\005types\030\007 \002(\014\022\017\n\007routeId\030\014 \002(\005\022\023\n\013s" +
- "tringNames\030\016 \001(\014\"\304\005\n\022OsmAndRoutingIndex\022" +
- "\014\n\004name\030\001 \002(\t\022?\n\005rules\030\002 \003(\01320.OsmAnd.OB" +
- "F.OsmAndRoutingIndex.RouteEncodingRule\022>" +
- "\n\trootBoxes\030\003 \003(\0132+.OsmAnd.OBF.OsmAndRou" +
- "tingIndex.RouteDataBox\022A\n\014basemapBoxes\030\004" +
- " \003(\0132+.OsmAnd.OBF.OsmAndRoutingIndex.Rou",
- "teDataBox\022=\n\006blocks\030\005 \003(\0132-.OsmAnd.OBF.O" +
- "smAndRoutingIndex.RouteDataBlock\032;\n\021Rout" +
- "eEncodingRule\022\013\n\003tag\030\003 \002(\t\022\r\n\005value\030\005 \002(" +
- "\t\022\n\n\002id\030\007 \001(\r\032\231\001\n\014RouteDataBox\022\014\n\004left\030\001" +
- " \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bott" +
- "om\030\004 \002(\021\022\023\n\013shiftToData\030\005 \001(\007\022:\n\005boxes\030\007" +
- " \003(\0132+.OsmAnd.OBF.OsmAndRoutingIndex.Rou" +
- "teDataBox\032\303\001\n\016RouteDataBlock\022$\n\007idTable\030" +
- "\005 \001(\0132\023.OsmAnd.OBF.IdTable\022*\n\013dataObject" +
- "s\030\006 \003(\0132\025.OsmAnd.OBF.RouteData\0221\n\014restri",
- "ctions\030\007 \003(\0132\033.OsmAnd.OBF.RestrictionDat" +
- "a\022,\n\013stringTable\030\010 \001(\0132\027.OsmAnd.OBF.Stri" +
- "ngTableB\036\n\021net.osmand.binaryB\tOsmandOdb"
+ "d.OBF.TransportRouteSchedule\"Q\n\031Incomple" +
+ "teTransportRoutes\0224\n\006routes\030\006 \003(\0132$.OsmA" +
+ "nd.OBF.IncompleteTransportRoute\"{\n\030Incom" +
+ "pleteTransportRoute\022\n\n\002id\030\001 \002(\004\022\014\n\004type\030" +
+ "\003 \001(\r\022\020\n\010operator\030\004 \001(\r\022\013\n\003ref\030\005 \001(\r\022\020\n\010" +
+ "routeRef\030\007 \002(\r\022\024\n\014missingStops\030\010 \003(\r\"\244\001\n" +
+ "\026TransportRouteSchedule\022\030\n\020avgStopInterv",
+ "als\030\001 \001(\014\022\030\n\020avgWaitIntervals\030\002 \001(\014\022\025\n\rt" +
+ "ripIntervals\030\003 \001(\014\022?\n\nexceptions\030\010 \003(\0132+" +
+ ".OsmAnd.OBF.TransportRouteScheduleExcept" +
+ "ion\"\313\001\n\037TransportRouteScheduleException\022" +
+ "\023\n\013tripIndexes\030\001 \003(\r\022\023\n\013stopIndexes\030\002 \003(" +
+ "\r\022\021\n\tavailable\030\003 \001(\010\022\024\n\014delayArrival\030\005 \003" +
+ "(\r\022\031\n\021deltaWaitInterval\030\006 \003(\005\022\034\n\024dayOfWe" +
+ "ekRestriction\030\007 \003(\r\022\034\n\024dayOfYearRestrict" +
+ "ion\030\010 \003(\r\"W\n\022TransportRouteStop\022\n\n\002id\030\001 " +
+ "\002(\022\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\014\n\004name\030\006 \002(",
+ "\r\022\017\n\007name_en\030\007 \001(\r\"\332\001\n\rTransportStop\022\n\n\002" +
+ "dx\030\001 \002(\021\022\n\n\002dy\030\002 \002(\021\022\n\n\002id\030\005 \002(\022\022\014\n\004name" +
+ "\030\006 \002(\r\022\017\n\007name_en\030\007 \001(\r\022\033\n\023additionalNam" +
+ "ePairs\030\010 \001(\014\022,\n\005exits\030\t \003(\0132\035.OsmAnd.OBF" +
+ ".TransportStopExit\022\016\n\006routes\030\020 \003(\r\022\030\n\020de" +
+ "letedRoutesIds\030\024 \003(\004\022\021\n\troutesIds\030\026 \003(\004\"" +
+ "8\n\021TransportStopExit\022\n\n\002dx\030\001 \002(\021\022\n\n\002dy\030\002" +
+ " \002(\021\022\013\n\003ref\030\003 \002(\r\"\272\001\n\022TransportStopsTree" +
+ "\022\014\n\004left\030\001 \002(\021\022\r\n\005right\030\002 \002(\021\022\013\n\003top\030\003 \002" +
+ "(\021\022\016\n\006bottom\030\004 \002(\021\0220\n\010subtrees\030\007 \003(\0132\036.O",
+ "smAnd.OBF.TransportStopsTree\022(\n\005leafs\030\010 " +
+ "\003(\0132\031.OsmAnd.OBF.TransportStop\022\016\n\006baseId" +
+ "\030\020 \001(\004\"\357\001\n\024OsmAndTransportIndex\022\014\n\004name\030" +
+ "\001 \001(\t\022+\n\006routes\030\003 \001(\0132\033.OsmAnd.OBF.Trans" +
+ "portRoutes\022-\n\005stops\030\006 \001(\0132\036.OsmAnd.OBF.T" +
+ "ransportStopsTree\022?\n\020incompleteRoutes\030\010 " +
+ "\001(\0132%.OsmAnd.OBF.IncompleteTransportRout" +
+ "es\022,\n\013stringTable\030\t \002(\0132\027.OsmAnd.OBF.Str" +
+ "ingTable\"\312\002\n\016OsmAndPoiIndex\022\014\n\004name\030\001 \002(" +
+ "\t\022-\n\nboundaries\030\002 \002(\0132\031.OsmAnd.OBF.OsmAn",
+ "dTileBox\0228\n\017categoriesTable\030\003 \003(\0132\037.OsmA" +
+ "nd.OBF.OsmAndCategoryTable\0221\n\tnameIndex\030" +
+ "\004 \001(\0132\036.OsmAnd.OBF.OsmAndPoiNameIndex\0226\n" +
+ "\rsubtypesTable\030\005 \001(\0132\037.OsmAnd.OBF.OsmAnd" +
+ "SubtypesTable\022\'\n\005boxes\030\006 \003(\0132\030.OsmAnd.OB" +
+ "F.OsmAndPoiBox\022-\n\007poiData\030\t \003(\0132\034.OsmAnd" +
+ ".OBF.OsmAndPoiBoxData\"\331\001\n\022OsmAndPoiNameI" +
+ "ndex\022-\n\005table\030\003 \002(\0132\036.OsmAnd.OBF.Indexed" +
+ "StringTable\022C\n\004data\030\005 \003(\01325.OsmAnd.OBF.O" +
+ "smAndPoiNameIndex.OsmAndPoiNameIndexData",
+ "\032O\n\026OsmAndPoiNameIndexData\0225\n\005atoms\030\003 \003(" +
+ "\0132&.OsmAnd.OBF.OsmAndPoiNameIndexDataAto" +
+ "m\"Q\n\032OsmAndPoiNameIndexDataAtom\022\014\n\004zoom\030" +
+ "\002 \001(\r\022\t\n\001x\030\003 \001(\r\022\t\n\001y\030\004 \001(\r\022\017\n\007shiftTo\030\016" +
+ " \001(\007\">\n\023OsmAndCategoryTable\022\020\n\010category\030" +
+ "\001 \002(\t\022\025\n\rsubcategories\030\003 \003(\t\"E\n\023OsmAndSu" +
+ "btypesTable\022.\n\010subtypes\030\004 \003(\0132\034.OsmAnd.O" +
+ "BF.OsmAndPoiSubtype\"\205\001\n\020OsmAndPoiSubtype" +
+ "\022\014\n\004name\030\001 \002(\t\022\017\n\007tagname\030\002 \001(\t\022\016\n\006isTex" +
+ "t\030\003 \002(\010\022\021\n\tfrequency\030\005 \001(\r\022\031\n\021subtypeVal",
+ "uesSize\030\006 \001(\r\022\024\n\014subtypeValue\030\010 \003(\t\"\255\001\n\014" +
+ "OsmAndPoiBox\022\014\n\004zoom\030\001 \002(\r\022\014\n\004left\030\002 \002(\021" +
+ "\022\013\n\003top\030\003 \002(\021\0223\n\ncategories\030\004 \001(\0132\037.OsmA" +
+ "nd.OBF.OsmAndPoiCategories\022*\n\010subBoxes\030\n" +
+ " \003(\0132\030.OsmAnd.OBF.OsmAndPoiBox\022\023\n\013shiftT" +
+ "oData\030\016 \001(\007\"@\n\023OsmAndPoiCategories\022\022\n\nca" +
+ "tegories\030\003 \003(\r\022\025\n\rsubcategories\030\005 \003(\r\"i\n" +
+ "\020OsmAndPoiBoxData\022\014\n\004zoom\030\001 \001(\r\022\t\n\001x\030\002 \001" +
+ "(\r\022\t\n\001y\030\003 \001(\r\0221\n\007poiData\030\005 \003(\0132 .OsmAnd." +
+ "OBF.OsmAndPoiBoxDataAtom\"\360\001\n\024OsmAndPoiBo",
+ "xDataAtom\022\n\n\002dx\030\002 \002(\021\022\n\n\002dy\030\003 \002(\021\022\022\n\ncat" +
+ "egories\030\004 \003(\r\022\025\n\rsubcategories\030\005 \003(\r\022\014\n\004" +
+ "name\030\006 \001(\t\022\016\n\006nameEn\030\007 \001(\t\022\n\n\002id\030\010 \001(\004\022\024" +
+ "\n\014openingHours\030\n \001(\t\022\014\n\004site\030\013 \001(\t\022\r\n\005ph" +
+ "one\030\014 \001(\t\022\014\n\004note\030\r \001(\t\022\026\n\016textCategorie" +
+ "s\030\016 \003(\r\022\022\n\ntextValues\030\017 \003(\t\"\032\n\007IdTable\022\017" +
+ "\n\007routeId\030\001 \003(\022\"F\n\017RestrictionData\022\014\n\004ty" +
+ "pe\030\001 \002(\005\022\014\n\004from\030\002 \002(\005\022\n\n\002to\030\003 \002(\005\022\013\n\003vi" +
+ "a\030\004 \001(\005\"x\n\tRouteData\022\016\n\006points\030\001 \002(\014\022\022\n\n" +
+ "pointTypes\030\004 \001(\014\022\022\n\npointNames\030\005 \001(\014\022\r\n\005",
+ "types\030\007 \002(\014\022\017\n\007routeId\030\014 \002(\005\022\023\n\013stringNa" +
+ "mes\030\016 \001(\014\"\304\005\n\022OsmAndRoutingIndex\022\014\n\004name" +
+ "\030\001 \002(\t\022?\n\005rules\030\002 \003(\01320.OsmAnd.OBF.OsmAn" +
+ "dRoutingIndex.RouteEncodingRule\022>\n\trootB" +
+ "oxes\030\003 \003(\0132+.OsmAnd.OBF.OsmAndRoutingInd" +
+ "ex.RouteDataBox\022A\n\014basemapBoxes\030\004 \003(\0132+." +
+ "OsmAnd.OBF.OsmAndRoutingIndex.RouteDataB" +
+ "ox\022=\n\006blocks\030\005 \003(\0132-.OsmAnd.OBF.OsmAndRo" +
+ "utingIndex.RouteDataBlock\032;\n\021RouteEncodi" +
+ "ngRule\022\013\n\003tag\030\003 \002(\t\022\r\n\005value\030\005 \002(\t\022\n\n\002id",
+ "\030\007 \001(\r\032\231\001\n\014RouteDataBox\022\014\n\004left\030\001 \002(\021\022\r\n" +
+ "\005right\030\002 \002(\021\022\013\n\003top\030\003 \002(\021\022\016\n\006bottom\030\004 \002(" +
+ "\021\022\023\n\013shiftToData\030\005 \001(\007\022:\n\005boxes\030\007 \003(\0132+." +
+ "OsmAnd.OBF.OsmAndRoutingIndex.RouteDataB" +
+ "ox\032\303\001\n\016RouteDataBlock\022$\n\007idTable\030\005 \001(\0132\023" +
+ ".OsmAnd.OBF.IdTable\022*\n\013dataObjects\030\006 \003(\013" +
+ "2\025.OsmAnd.OBF.RouteData\0221\n\014restrictions\030" +
+ "\007 \003(\0132\033.OsmAnd.OBF.RestrictionData\022,\n\013st" +
+ "ringTable\030\010 \001(\0132\027.OsmAnd.OBF.StringTable" +
+ "B\036\n\021net.osmand.binaryB\tOsmandOdb"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -63197,56 +65177,68 @@ public final class OsmandOdb {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_TransportRoute_descriptor,
new java.lang.String[] { "Id", "Type", "Operator", "Ref", "Name", "NameEn", "Distance", "Color", "DirectStops", "ReverseStops", "Geometry", "ScheduleTrip", });
- internal_static_OsmAnd_OBF_TransportRouteSchedule_descriptor =
+ internal_static_OsmAnd_OBF_IncompleteTransportRoutes_descriptor =
getDescriptor().getMessageTypes().get(17);
+ internal_static_OsmAnd_OBF_IncompleteTransportRoutes_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_OsmAnd_OBF_IncompleteTransportRoutes_descriptor,
+ new java.lang.String[] { "Routes", });
+ internal_static_OsmAnd_OBF_IncompleteTransportRoute_descriptor =
+ getDescriptor().getMessageTypes().get(18);
+ internal_static_OsmAnd_OBF_IncompleteTransportRoute_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ internal_static_OsmAnd_OBF_IncompleteTransportRoute_descriptor,
+ new java.lang.String[] { "Id", "Type", "Operator", "Ref", "RouteRef", "MissingStops", });
+ internal_static_OsmAnd_OBF_TransportRouteSchedule_descriptor =
+ getDescriptor().getMessageTypes().get(19);
internal_static_OsmAnd_OBF_TransportRouteSchedule_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_TransportRouteSchedule_descriptor,
new java.lang.String[] { "AvgStopIntervals", "AvgWaitIntervals", "TripIntervals", "Exceptions", });
internal_static_OsmAnd_OBF_TransportRouteScheduleException_descriptor =
- getDescriptor().getMessageTypes().get(18);
+ getDescriptor().getMessageTypes().get(20);
internal_static_OsmAnd_OBF_TransportRouteScheduleException_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_TransportRouteScheduleException_descriptor,
new java.lang.String[] { "TripIndexes", "StopIndexes", "Available", "DelayArrival", "DeltaWaitInterval", "DayOfWeekRestriction", "DayOfYearRestriction", });
internal_static_OsmAnd_OBF_TransportRouteStop_descriptor =
- getDescriptor().getMessageTypes().get(19);
+ getDescriptor().getMessageTypes().get(21);
internal_static_OsmAnd_OBF_TransportRouteStop_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_TransportRouteStop_descriptor,
new java.lang.String[] { "Id", "Dx", "Dy", "Name", "NameEn", });
internal_static_OsmAnd_OBF_TransportStop_descriptor =
- getDescriptor().getMessageTypes().get(20);
+ getDescriptor().getMessageTypes().get(22);
internal_static_OsmAnd_OBF_TransportStop_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_TransportStop_descriptor,
new java.lang.String[] { "Dx", "Dy", "Id", "Name", "NameEn", "AdditionalNamePairs", "Exits", "Routes", "DeletedRoutesIds", "RoutesIds", });
internal_static_OsmAnd_OBF_TransportStopExit_descriptor =
- getDescriptor().getMessageTypes().get(21);
+ getDescriptor().getMessageTypes().get(23);
internal_static_OsmAnd_OBF_TransportStopExit_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_TransportStopExit_descriptor,
new java.lang.String[] { "Dx", "Dy", "Ref", });
internal_static_OsmAnd_OBF_TransportStopsTree_descriptor =
- getDescriptor().getMessageTypes().get(22);
+ getDescriptor().getMessageTypes().get(24);
internal_static_OsmAnd_OBF_TransportStopsTree_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_TransportStopsTree_descriptor,
new java.lang.String[] { "Left", "Right", "Top", "Bottom", "Subtrees", "Leafs", "BaseId", });
internal_static_OsmAnd_OBF_OsmAndTransportIndex_descriptor =
- getDescriptor().getMessageTypes().get(23);
+ getDescriptor().getMessageTypes().get(25);
internal_static_OsmAnd_OBF_OsmAndTransportIndex_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndTransportIndex_descriptor,
- new java.lang.String[] { "Name", "Routes", "Stops", "StringTable", });
+ new java.lang.String[] { "Name", "Routes", "Stops", "IncompleteRoutes", "StringTable", });
internal_static_OsmAnd_OBF_OsmAndPoiIndex_descriptor =
- getDescriptor().getMessageTypes().get(24);
+ getDescriptor().getMessageTypes().get(26);
internal_static_OsmAnd_OBF_OsmAndPoiIndex_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndPoiIndex_descriptor,
new java.lang.String[] { "Name", "Boundaries", "CategoriesTable", "NameIndex", "SubtypesTable", "Boxes", "PoiData", });
internal_static_OsmAnd_OBF_OsmAndPoiNameIndex_descriptor =
- getDescriptor().getMessageTypes().get(25);
+ getDescriptor().getMessageTypes().get(27);
internal_static_OsmAnd_OBF_OsmAndPoiNameIndex_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndPoiNameIndex_descriptor,
@@ -63258,73 +65250,73 @@ public final class OsmandOdb {
internal_static_OsmAnd_OBF_OsmAndPoiNameIndex_OsmAndPoiNameIndexData_descriptor,
new java.lang.String[] { "Atoms", });
internal_static_OsmAnd_OBF_OsmAndPoiNameIndexDataAtom_descriptor =
- getDescriptor().getMessageTypes().get(26);
+ getDescriptor().getMessageTypes().get(28);
internal_static_OsmAnd_OBF_OsmAndPoiNameIndexDataAtom_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndPoiNameIndexDataAtom_descriptor,
new java.lang.String[] { "Zoom", "X", "Y", "ShiftTo", });
internal_static_OsmAnd_OBF_OsmAndCategoryTable_descriptor =
- getDescriptor().getMessageTypes().get(27);
+ getDescriptor().getMessageTypes().get(29);
internal_static_OsmAnd_OBF_OsmAndCategoryTable_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndCategoryTable_descriptor,
new java.lang.String[] { "Category", "Subcategories", });
internal_static_OsmAnd_OBF_OsmAndSubtypesTable_descriptor =
- getDescriptor().getMessageTypes().get(28);
+ getDescriptor().getMessageTypes().get(30);
internal_static_OsmAnd_OBF_OsmAndSubtypesTable_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndSubtypesTable_descriptor,
new java.lang.String[] { "Subtypes", });
internal_static_OsmAnd_OBF_OsmAndPoiSubtype_descriptor =
- getDescriptor().getMessageTypes().get(29);
+ getDescriptor().getMessageTypes().get(31);
internal_static_OsmAnd_OBF_OsmAndPoiSubtype_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndPoiSubtype_descriptor,
new java.lang.String[] { "Name", "Tagname", "IsText", "Frequency", "SubtypeValuesSize", "SubtypeValue", });
internal_static_OsmAnd_OBF_OsmAndPoiBox_descriptor =
- getDescriptor().getMessageTypes().get(30);
+ getDescriptor().getMessageTypes().get(32);
internal_static_OsmAnd_OBF_OsmAndPoiBox_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndPoiBox_descriptor,
new java.lang.String[] { "Zoom", "Left", "Top", "Categories", "SubBoxes", "ShiftToData", });
internal_static_OsmAnd_OBF_OsmAndPoiCategories_descriptor =
- getDescriptor().getMessageTypes().get(31);
+ getDescriptor().getMessageTypes().get(33);
internal_static_OsmAnd_OBF_OsmAndPoiCategories_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndPoiCategories_descriptor,
new java.lang.String[] { "Categories", "Subcategories", });
internal_static_OsmAnd_OBF_OsmAndPoiBoxData_descriptor =
- getDescriptor().getMessageTypes().get(32);
+ getDescriptor().getMessageTypes().get(34);
internal_static_OsmAnd_OBF_OsmAndPoiBoxData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndPoiBoxData_descriptor,
new java.lang.String[] { "Zoom", "X", "Y", "PoiData", });
internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_descriptor =
- getDescriptor().getMessageTypes().get(33);
+ getDescriptor().getMessageTypes().get(35);
internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndPoiBoxDataAtom_descriptor,
new java.lang.String[] { "Dx", "Dy", "Categories", "Subcategories", "Name", "NameEn", "Id", "OpeningHours", "Site", "Phone", "Note", "TextCategories", "TextValues", });
internal_static_OsmAnd_OBF_IdTable_descriptor =
- getDescriptor().getMessageTypes().get(34);
+ getDescriptor().getMessageTypes().get(36);
internal_static_OsmAnd_OBF_IdTable_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_IdTable_descriptor,
new java.lang.String[] { "RouteId", });
internal_static_OsmAnd_OBF_RestrictionData_descriptor =
- getDescriptor().getMessageTypes().get(35);
+ getDescriptor().getMessageTypes().get(37);
internal_static_OsmAnd_OBF_RestrictionData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_RestrictionData_descriptor,
new java.lang.String[] { "Type", "From", "To", "Via", });
internal_static_OsmAnd_OBF_RouteData_descriptor =
- getDescriptor().getMessageTypes().get(36);
+ getDescriptor().getMessageTypes().get(38);
internal_static_OsmAnd_OBF_RouteData_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_RouteData_descriptor,
new java.lang.String[] { "Points", "PointTypes", "PointNames", "Types", "RouteId", "StringNames", });
internal_static_OsmAnd_OBF_OsmAndRoutingIndex_descriptor =
- getDescriptor().getMessageTypes().get(37);
+ getDescriptor().getMessageTypes().get(39);
internal_static_OsmAnd_OBF_OsmAndRoutingIndex_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_OsmAnd_OBF_OsmAndRoutingIndex_descriptor,
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
index 0dfc2e5c83..0fb0bdacf6 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java
@@ -1011,6 +1011,17 @@ public class RouteDataObject {
rf == null ? "" : rf);
}
+ public boolean hasNameTagStartsWith(String tagStartsWith) {
+ int[] nextSegmentNameIds = nameIds;
+ for (int nm = 0; nm < nameIds.length; nm++) {
+ RouteTypeRule rtr = region.quickGetEncodingRule(nameIds[nm]);
+ if (rtr != null && rtr.getTag().startsWith(tagStartsWith)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static class RestrictionInfo {
public int type;
public long toWay;
diff --git a/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java b/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
index 64839b8649..387c655112 100644
--- a/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
+++ b/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
@@ -124,8 +124,10 @@ public class TransportRoute extends MapObject {
if(reverseSecond) {
second.reverseNodes();
}
- for (int i = 1; i < second.getNodes().size(); i++) {
- first.addNode(second.getNodes().get(i));
+ if (first != second && (first.getId() < 0 || first.getId() != second.getId())) {
+ for (int i = 1; i < second.getNodes().size(); i++) {
+ first.addNode(second.getNodes().get(i));
+ }
}
changed = true;
} else {
diff --git a/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
index 5124d40cf4..89e422ec60 100644
--- a/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
+++ b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
@@ -291,8 +291,14 @@ public class SearchUICore {
return null;
}
- public SearchResultCollection shallowSearch(Class cl,
- String text, final ResultMatcher matcher) throws IOException {
+ public SearchResultCollection shallowSearch(Class cl, String text,
+ ResultMatcher matcher) throws IOException {
+ return shallowSearch(cl, text, matcher, true, true);
+ }
+
+ public SearchResultCollection shallowSearch(Class cl, String text,
+ final ResultMatcher matcher,
+ boolean resortAll, boolean removeDuplicates) throws IOException {
T api = getApiByClass(cl);
if (api != null) {
if (debugMode) {
@@ -306,7 +312,7 @@ public class SearchUICore {
SearchResultCollection collection = new SearchResultCollection(
sphrase);
- collection.addSearchResults(rm.getRequestResults(), true, true);
+ collection.addSearchResults(rm.getRequestResults(), resortAll, removeDuplicates);
if (debugMode) {
LOG.info("Finish shallow search <" + sphrase + "> Results=" + rm.getRequestResults().size());
}
diff --git a/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java
index a7da5e3ff5..780713b3c3 100644
--- a/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java
+++ b/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java
@@ -1024,10 +1024,14 @@ public class OpeningHoursParser {
@Override
public String toRuleString() {
- return toRuleString(daysStr, monthsStr);
+ return toRuleString(false);
}
- private String toRuleString(String[] dayNames, String[] monthNames) {
+ private String toRuleString(boolean useLocalization) {
+ String[] dayNames = useLocalization ? localDaysStr : daysStr;
+ String[] monthNames = useLocalization ? localMothsStr : monthsStr;
+ String offStr = useLocalization ? additionalStrings.get("off") : "off";
+
StringBuilder b = new StringBuilder(25);
boolean allMonths = true;
for (int i = 0; i < months.length; i++) {
@@ -1160,7 +1164,7 @@ public class OpeningHoursParser {
b.append("24/7 ");
}
if (off) {
- b.append(additionalStrings.get("off"));
+ b.append(offStr);
}
} else {
if (isOpened24_7()) {
@@ -1182,7 +1186,7 @@ public class OpeningHoursParser {
formatTime(enHour, enTime, b);
}
if (off) {
- b.append(" ").append(additionalStrings.get("off"));
+ b.append(" ").append(offStr);
}
}
}
@@ -1238,7 +1242,7 @@ public class OpeningHoursParser {
@Override
public String toLocalRuleString() {
- return toRuleString(localDaysStr, localMothsStr);
+ return toRuleString(true);
}
@Override
diff --git a/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml b/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml
index d610280ac2..ec98a3a956 100644
--- a/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml
+++ b/OsmAnd-telegram/res/layout/fragment_my_location_tab.xml
@@ -307,8 +307,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
- android:drawableStart="@drawable/ic_action_undo"
- android:drawableLeft="@drawable/ic_action_undo"
+ app:drawableLeftCompat="@drawable/ic_action_undo"
+ app:drawableStartCompat="@drawable/ic_action_undo"
android:drawablePadding="@dimen/my_location_text_sides_margin"
android:gravity="center_vertical"
android:minHeight="@dimen/list_item_height_min"
@@ -341,9 +341,9 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:background="@drawable/extended_fab_bg"
- android:drawableLeft="@drawable/ic_action_share_location"
+ app:drawableLeftCompat="@drawable/ic_action_share_location"
+ app:drawableStartCompat="@drawable/ic_action_share_location"
android:drawablePadding="@dimen/content_padding_half"
- android:drawableStart="@drawable/ic_action_share_location"
android:gravity="center"
android:paddingLeft="32dp"
android:paddingRight="32dp"
diff --git a/OsmAnd-telegram/res/values-be/strings.xml b/OsmAnd-telegram/res/values-be/strings.xml
index a9ecc380db..47b4a67654 100644
--- a/OsmAnd-telegram/res/values-be/strings.xml
+++ b/OsmAnd-telegram/res/values-be/strings.xml
@@ -255,7 +255,7 @@
Часавы пояс
Адзінкі вымярэння і фарматы
Змяніць адзінкі вымярэння адлегласці.
- Адзінкі даўжыні
+ Адзінкі вымярэння адлегласці
Вызначце адзінку вымярэння хуткасці.
Адзінка вымярэння хуткасці
Максімальны час захоўвання пунктаў у буферы
diff --git a/OsmAnd-telegram/res/values-fi/strings.xml b/OsmAnd-telegram/res/values-fi/strings.xml
index 0347295cb7..0016e0f284 100644
--- a/OsmAnd-telegram/res/values-fi/strings.xml
+++ b/OsmAnd-telegram/res/values-fi/strings.xml
@@ -3,4 +3,42 @@
Pois käytöstä
Tallenna
Lisää laite
+ Mailia/jalkaa
+ Minuutteja mailille
+ Minuutteja kilometrille
+ Metriä sekunnissa
+ Mailia tunnissa
+ Kilometriä tunnissa
+ mph
+ km/h
+ m/s
+ min/km
+ min/m
+ m
+ km
+ Asetukset
+ Peruuta
+ Jatka
+ Takaisin
+ Jaa
+ Asenna
+ Pois päältä
+ Kaikki
+ Sulje
+ Poistu
+ Nimi
+ Tila
+ Käytössä
+ Piilota
+ Lisää
+ Kartta
+ Keskinopeus
+ Keskimääräinen korkeus
+ Ulkoasu
+ OK
+ Etsi
+ Korkeus
+ Ota käyttöön
+ Valitse
+ Käytä
\ No newline at end of file
diff --git a/OsmAnd-telegram/res/values-gl/strings.xml b/OsmAnd-telegram/res/values-gl/strings.xml
index 69d0c5fa41..c7d9f4cb4e 100644
--- a/OsmAnd-telegram/res/values-gl/strings.xml
+++ b/OsmAnd-telegram/res/values-gl/strings.xml
@@ -56,7 +56,7 @@
%1$d min
%1$d h
Instalar
- Compartillar
+ Compartir
Voltar
Engadir
Escolle un nome que aínda non está a ser empregado
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index dd7d46b751..6bebf5f67b 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -52,7 +52,8 @@ android {
versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
// Stops the Gradle plugin’s automatic rasterization of vectors
- vectorDrawables.generatedDensities = ['hdpi']
+ // vectorDrawables.generatedDensities = ['hdpi']
+ vectorDrawables.useSupportLibrary = true
}
lintOptions {
@@ -84,7 +85,7 @@ android {
noCompress "qz"
cruncherEnabled = false
// Flag notifies aapt to keep the attribute IDs around
- additionalParameters "--no-version-vectors"
+ // additionalParameters "--no-version-vectors"
}
dexOptions {
@@ -523,7 +524,7 @@ dependencies {
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'com.google.android.material:material:1.2.0-alpha05'
+ implementation 'com.google.android.material:material:1.2.0-alpha06'
implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.preference:preference:1.1.0'
implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_add_photos.png b/OsmAnd/res/drawable-hdpi/ic_action_add_photos.png
deleted file mode 100644
index ec4c0fc350..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_add_photos.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_additional_option.png b/OsmAnd/res/drawable-hdpi/ic_action_additional_option.png
deleted file mode 100644
index 87762cddb7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_additional_option.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_addpoint_above.png b/OsmAnd/res/drawable-hdpi/ic_action_addpoint_above.png
deleted file mode 100644
index 62b6a8e3d3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_addpoint_above.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_addpoint_below.png b/OsmAnd/res/drawable-hdpi/ic_action_addpoint_below.png
deleted file mode 100644
index 1b751f3a06..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_addpoint_below.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_alert.png b/OsmAnd/res/drawable-hdpi/ic_action_alert.png
deleted file mode 100644
index e175feed83..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_alert.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_allow_private_access.png b/OsmAnd/res/drawable-hdpi/ic_action_allow_private_access.png
deleted file mode 100644
index e0fd9cf302..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_allow_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_altitude.png b/OsmAnd/res/drawable-hdpi/ic_action_altitude.png
deleted file mode 100644
index 43a9f8b8e6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_altitude.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_altitude_ascent.png b/OsmAnd/res/drawable-hdpi/ic_action_altitude_ascent.png
deleted file mode 100644
index aa69b56e23..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_altitude_ascent.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_altitude_average.png b/OsmAnd/res/drawable-hdpi/ic_action_altitude_average.png
deleted file mode 100644
index 28ef08d495..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_altitude_average.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_altitude_average_16.png b/OsmAnd/res/drawable-hdpi/ic_action_altitude_average_16.png
deleted file mode 100644
index 284b9b2253..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_altitude_average_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_altitude_descent.png b/OsmAnd/res/drawable-hdpi/ic_action_altitude_descent.png
deleted file mode 100644
index 6e78637fff..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_altitude_descent.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_altitude_descent_ascent_16.png b/OsmAnd/res/drawable-hdpi/ic_action_altitude_descent_ascent_16.png
deleted file mode 100644
index b254cc1baa..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_altitude_descent_ascent_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_altitude_range_16.png b/OsmAnd/res/drawable-hdpi/ic_action_altitude_range_16.png
deleted file mode 100644
index 145f9cb470..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_altitude_range_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_angular_unit.png b/OsmAnd/res/drawable-hdpi/ic_action_angular_unit.png
deleted file mode 100755
index be52d60098..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_angular_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_app_configuration.png b/OsmAnd/res/drawable-hdpi/ic_action_app_configuration.png
deleted file mode 100644
index 3b090a3b74..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_app_configuration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_appearance.png b/OsmAnd/res/drawable-hdpi/ic_action_appearance.png
deleted file mode 100644
index cbe4df869e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_appearance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_arrow_down.png b/OsmAnd/res/drawable-hdpi/ic_action_arrow_down.png
deleted file mode 100644
index 438973c6b6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_arrow_down.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_arrow_drop_down.png b/OsmAnd/res/drawable-hdpi/ic_action_arrow_drop_down.png
deleted file mode 100644
index 0728a388e5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_arrow_drop_down.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_arrow_drop_up.png b/OsmAnd/res/drawable-hdpi/ic_action_arrow_drop_up.png
deleted file mode 100644
index 089e2b2ff7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_arrow_drop_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_arrow_forward_16.png b/OsmAnd/res/drawable-hdpi/ic_action_arrow_forward_16.png
deleted file mode 100644
index 46ba82e995..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_arrow_forward_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_arrow_up.png b/OsmAnd/res/drawable-hdpi/ic_action_arrow_up.png
deleted file mode 100644
index 93a03325d9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_arrow_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_avoid_motorways.png b/OsmAnd/res/drawable-hdpi/ic_action_avoid_motorways.png
deleted file mode 100644
index 7820b1e9e5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_avoid_motorways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_backspace_fill.png b/OsmAnd/res/drawable-hdpi/ic_action_backspace_fill.png
deleted file mode 100644
index 0e5d450c7f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_backspace_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_backspace_stroke.png b/OsmAnd/res/drawable-hdpi/ic_action_backspace_stroke.png
deleted file mode 100644
index 356626f4f3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_backspace_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_battery.png b/OsmAnd/res/drawable-hdpi/ic_action_battery.png
deleted file mode 100644
index 5b10e68015..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_battery.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_bearing.png b/OsmAnd/res/drawable-hdpi/ic_action_bearing.png
deleted file mode 100644
index fcf47cb9fd..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_bearing.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_bearing_16.png b/OsmAnd/res/drawable-hdpi/ic_action_bearing_16.png
deleted file mode 100644
index aaa06d50e0..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_bearing_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_big_feedback.png b/OsmAnd/res/drawable-hdpi/ic_action_big_feedback.png
deleted file mode 100644
index a716f860f6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_big_feedback.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_big_poll.png b/OsmAnd/res/drawable-hdpi/ic_action_big_poll.png
deleted file mode 100644
index cc8d3fc06c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_big_poll.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_bitcoin.png b/OsmAnd/res/drawable-hdpi/ic_action_bitcoin.png
deleted file mode 100644
index d0b5a5ce8f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_bitcoin.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_building.png b/OsmAnd/res/drawable-hdpi/ic_action_building.png
deleted file mode 100644
index 4537bba8cf..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_building.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_building_number.png b/OsmAnd/res/drawable-hdpi/ic_action_building_number.png
deleted file mode 100644
index d6bf0506b7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_building_number.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_call_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_call_dark.png
deleted file mode 100644
index cd44be16b6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_call_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_change_navigation_points.png b/OsmAnd/res/drawable-hdpi/ic_action_change_navigation_points.png
deleted file mode 100644
index 36dad7cd5f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_change_navigation_points.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_circle.png b/OsmAnd/res/drawable-hdpi/ic_action_circle.png
deleted file mode 100644
index 249dc9aa71..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_circle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_clear_all.png b/OsmAnd/res/drawable-hdpi/ic_action_clear_all.png
deleted file mode 100644
index da03c8696d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_clear_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_clear_all_fields.png b/OsmAnd/res/drawable-hdpi/ic_action_clear_all_fields.png
deleted file mode 100644
index cd5e488d25..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_clear_all_fields.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_close_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_close_dark.png
deleted file mode 100644
index 3616944dbb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_close_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_compass.png b/OsmAnd/res/drawable-hdpi/ic_action_compass.png
deleted file mode 100644
index fcd637f630..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_contents.png b/OsmAnd/res/drawable-hdpi/ic_action_contents.png
deleted file mode 100644
index 50eccae2e4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_contents.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_cuisine.png b/OsmAnd/res/drawable-hdpi/ic_action_cuisine.png
deleted file mode 100644
index 962d970f07..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_cuisine.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_data.png b/OsmAnd/res/drawable-hdpi/ic_action_data.png
deleted file mode 100644
index 4579f789f5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_data.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_description.png b/OsmAnd/res/drawable-hdpi/ic_action_description.png
deleted file mode 100644
index 0828dc7c23..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_description.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_deselect_all.png b/OsmAnd/res/drawable-hdpi/ic_action_deselect_all.png
deleted file mode 100644
index 18284ab657..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_deselect_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_camera.png b/OsmAnd/res/drawable-hdpi/ic_action_device_camera.png
deleted file mode 100644
index a0a04c125c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_device_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_top.png b/OsmAnd/res/drawable-hdpi/ic_action_device_top.png
deleted file mode 100644
index c26f11958b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_device_top.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_topbar.png b/OsmAnd/res/drawable-hdpi/ic_action_device_topbar.png
deleted file mode 100644
index 6aea76546c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_device_topbar.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_topbar_two.png b/OsmAnd/res/drawable-hdpi/ic_action_device_topbar_two.png
deleted file mode 100644
index 55cd34bd10..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_device_topbar_two.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_widget.png b/OsmAnd/res/drawable-hdpi/ic_action_device_widget.png
deleted file mode 100644
index 6f303c7419..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_device_widget.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_device_widget_two.png b/OsmAnd/res/drawable-hdpi/ic_action_device_widget_two.png
deleted file mode 100644
index 0a671c5481..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_device_widget_two.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_direction_compass.png b/OsmAnd/res/drawable-hdpi/ic_action_direction_compass.png
deleted file mode 100755
index 7543f790ae..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_direction_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_direction_movement.png b/OsmAnd/res/drawable-hdpi/ic_action_direction_movement.png
deleted file mode 100755
index e3762c407f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_direction_movement.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_direction_north.png b/OsmAnd/res/drawable-hdpi/ic_action_direction_north.png
deleted file mode 100755
index 18d46996b0..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_direction_north.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_display_position_bottom.png b/OsmAnd/res/drawable-hdpi/ic_action_display_position_bottom.png
deleted file mode 100644
index 2c1cbc9785..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_display_position_bottom.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_display_position_center.png b/OsmAnd/res/drawable-hdpi/ic_action_display_position_center.png
deleted file mode 100644
index 3a7d8c4557..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_display_position_center.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_done.png b/OsmAnd/res/drawable-hdpi/ic_action_done.png
deleted file mode 100644
index c49faa1154..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_done.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_down_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_down_dark.png
deleted file mode 100644
index 5138fcb62d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_down_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png
deleted file mode 100644
index bff0bdb1a9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_elevation.png b/OsmAnd/res/drawable-hdpi/ic_action_elevation.png
deleted file mode 100644
index 5f6e69aa61..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_elevation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_explore.png b/OsmAnd/res/drawable-hdpi/ic_action_explore.png
deleted file mode 100644
index 2b404cbd9a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_explore.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_export.png b/OsmAnd/res/drawable-hdpi/ic_action_export.png
deleted file mode 100644
index 06c26dbce3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_export.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fastest_route.png b/OsmAnd/res/drawable-hdpi/ic_action_fastest_route.png
deleted file mode 100755
index 826e5ca099..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_fastest_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_filter.png b/OsmAnd/res/drawable-hdpi/ic_action_filter.png
deleted file mode 100644
index e7f5464b81..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_filter.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_filter_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_filter_dark.png
deleted file mode 100644
index b4cdc379b6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_folder.png b/OsmAnd/res/drawable-hdpi/ic_action_folder.png
deleted file mode 100644
index e6dd61dfa9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_folder.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_folder_move.png b/OsmAnd/res/drawable-hdpi/ic_action_folder_move.png
deleted file mode 100644
index 1e3c68cb95..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_folder_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_folder_stroke.png b/OsmAnd/res/drawable-hdpi/ic_action_folder_stroke.png
deleted file mode 100644
index 313d96d692..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_folder_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_forbid_private_access.png b/OsmAnd/res/drawable-hdpi/ic_action_forbid_private_access.png
deleted file mode 100644
index bf0de8b1bd..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_forbid_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fps.png b/OsmAnd/res/drawable-hdpi/ic_action_fps.png
deleted file mode 100644
index ee235d65b5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_fps.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_fuel.png b/OsmAnd/res/drawable-hdpi/ic_action_fuel.png
deleted file mode 100644
index cfa278c5fe..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_fuel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gabout_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gabout_dark.png
deleted file mode 100644
index 9691410269..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gabout_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gdirections_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gdirections_dark.png
deleted file mode 100644
index ad3e3daaa3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gdirections_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_get_my_location.png b/OsmAnd/res/drawable-hdpi/ic_action_get_my_location.png
deleted file mode 100644
index 7845932c5f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_get_my_location.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gift.png b/OsmAnd/res/drawable-hdpi/ic_action_gift.png
deleted file mode 100644
index 9d69f4e385..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gift.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gnew_label_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gnew_label_dark.png
deleted file mode 100644
index 85a29af959..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gnew_label_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gps_info.png b/OsmAnd/res/drawable-hdpi/ic_action_gps_info.png
deleted file mode 100644
index d1a0d21a8e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gps_info.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_bold.png b/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_bold.png
deleted file mode 100644
index b660ccc6dd..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_bold.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_medium.png b/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_medium.png
deleted file mode 100644
index 8b8da981d6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_medium.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_thin.png b/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_thin.png
deleted file mode 100644
index 8e42bb067a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gpx_width_thin.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gremove_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gremove_dark.png
deleted file mode 100644
index b7036a6899..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gremove_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_group2.png b/OsmAnd/res/drawable-hdpi/ic_action_group2.png
deleted file mode 100644
index 3aa5e40fc3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_group2.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_group_name_16.png b/OsmAnd/res/drawable-hdpi/ic_action_group_name_16.png
deleted file mode 100644
index 6924d9ec2e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_group_name_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_group_select_all.png b/OsmAnd/res/drawable-hdpi/ic_action_group_select_all.png
deleted file mode 100644
index f5f6e1bd1a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_group_select_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_height_limit.png b/OsmAnd/res/drawable-hdpi/ic_action_height_limit.png
deleted file mode 100755
index 6bcd4b3038..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_height_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_help.png b/OsmAnd/res/drawable-hdpi/ic_action_help.png
deleted file mode 100644
index 030e6889ea..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_help.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_hide.png b/OsmAnd/res/drawable-hdpi/ic_action_hide.png
deleted file mode 100644
index 547f39bc2a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_hide.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_hillshade_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_hillshade_dark.png
deleted file mode 100644
index 86c9ac59ae..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_hillshade_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_history.png b/OsmAnd/res/drawable-hdpi/ic_action_history.png
deleted file mode 100644
index a8e782e09b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_history.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_history2.png b/OsmAnd/res/drawable-hdpi/ic_action_history2.png
deleted file mode 100644
index efe2f33172..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_history2.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_intermediate.png b/OsmAnd/res/drawable-hdpi/ic_action_intermediate.png
deleted file mode 100644
index 517713557e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_intermediate_destination.png b/OsmAnd/res/drawable-hdpi/ic_action_intermediate_destination.png
deleted file mode 100644
index 5d4caeb7d3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_intermediate_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_intermediate_destination_time.png b/OsmAnd/res/drawable-hdpi/ic_action_intermediate_destination_time.png
deleted file mode 100644
index c28fee0711..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_intermediate_destination_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_internet_access_fee.png b/OsmAnd/res/drawable-hdpi/ic_action_internet_access_fee.png
deleted file mode 100644
index 805550f270..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_internet_access_fee.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_intersection.png b/OsmAnd/res/drawable-hdpi/ic_action_intersection.png
deleted file mode 100644
index 7a5d6d0453..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_intersection.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_item_move.png b/OsmAnd/res/drawable-hdpi/ic_action_item_move.png
deleted file mode 100644
index beb5146138..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_item_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_keyboard.png b/OsmAnd/res/drawable-hdpi/ic_action_keyboard.png
deleted file mode 100644
index e4cf154cd2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_keyboard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_keyboard_hide.png b/OsmAnd/res/drawable-hdpi/ic_action_keyboard_hide.png
deleted file mode 100644
index c4de6d3d98..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_keyboard_hide.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_label.png b/OsmAnd/res/drawable-hdpi/ic_action_label.png
deleted file mode 100644
index 222387bdba..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_label.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_lanes.png b/OsmAnd/res/drawable-hdpi/ic_action_lanes.png
deleted file mode 100755
index a7cba66551..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_lanes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_list_bullet.png b/OsmAnd/res/drawable-hdpi/ic_action_list_bullet.png
deleted file mode 100644
index d751e56ff6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_list_bullet.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_list_header.png b/OsmAnd/res/drawable-hdpi/ic_action_list_header.png
deleted file mode 100644
index 72896911ae..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_list_header.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_list_sort.png b/OsmAnd/res/drawable-hdpi/ic_action_list_sort.png
deleted file mode 100644
index 1352ece179..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_list_sort.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_location_color.png b/OsmAnd/res/drawable-hdpi/ic_action_location_color.png
deleted file mode 100644
index cc56398258..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_location_color.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_location_color_lost.png b/OsmAnd/res/drawable-hdpi/ic_action_location_color_lost.png
deleted file mode 100644
index 005dda7dd6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_location_color_lost.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_location_off.png b/OsmAnd/res/drawable-hdpi/ic_action_location_off.png
deleted file mode 100644
index bfa1139c4f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_location_off.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_location_sharing_app.png b/OsmAnd/res/drawable-hdpi/ic_action_location_sharing_app.png
deleted file mode 100644
index fbc3cf252c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_location_sharing_app.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_day.png b/OsmAnd/res/drawable-hdpi/ic_action_map_day.png
deleted file mode 100644
index df786a43a7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_language.png b/OsmAnd/res/drawable-hdpi/ic_action_map_language.png
deleted file mode 100644
index d853cb12cb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_language.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_light_sensor.png b/OsmAnd/res/drawable-hdpi/ic_action_map_light_sensor.png
deleted file mode 100644
index f5d50870ef..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_light_sensor.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_magnifier.png b/OsmAnd/res/drawable-hdpi/ic_action_map_magnifier.png
deleted file mode 100644
index 7e9f2d89b4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_magnifier.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_night.png b/OsmAnd/res/drawable-hdpi/ic_action_map_night.png
deleted file mode 100644
index f36f78aa28..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_routes.png b/OsmAnd/res/drawable-hdpi/ic_action_map_routes.png
deleted file mode 100644
index f7943d00d8..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_routes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_sunset.png b/OsmAnd/res/drawable-hdpi/ic_action_map_sunset.png
deleted file mode 100755
index 0a917aa9d6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_sunset.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_map_text_size.png b/OsmAnd/res/drawable-hdpi/ic_action_map_text_size.png
deleted file mode 100644
index 44bde61830..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_map_text_size.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_mapillary.png b/OsmAnd/res/drawable-hdpi/ic_action_mapillary.png
deleted file mode 100644
index 9e2531566e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_mapillary.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_marker_passed.png b/OsmAnd/res/drawable-hdpi/ic_action_marker_passed.png
deleted file mode 100644
index b1baa26469..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_marker_passed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_markers_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_markers_dark.png
deleted file mode 100644
index 5b1ce772a6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_markers_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_markers_list.png b/OsmAnd/res/drawable-hdpi/ic_action_markers_list.png
deleted file mode 100644
index c27f2d2d5d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_markers_list.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_max_speed.png b/OsmAnd/res/drawable-hdpi/ic_action_max_speed.png
deleted file mode 100644
index fe6ccb99ca..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_max_speed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_max_speed_16.png b/OsmAnd/res/drawable-hdpi/ic_action_max_speed_16.png
deleted file mode 100644
index f4b2d7f274..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_max_speed_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_measure_point.png b/OsmAnd/res/drawable-hdpi/ic_action_measure_point.png
deleted file mode 100644
index 24bdc13797..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_measure_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_message.png b/OsmAnd/res/drawable-hdpi/ic_action_message.png
deleted file mode 100644
index 4a74fe9682..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_message.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_minimize.png b/OsmAnd/res/drawable-hdpi/ic_action_minimize.png
deleted file mode 100644
index 5997ad1d45..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_minimize.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_moon.png b/OsmAnd/res/drawable-hdpi/ic_action_moon.png
deleted file mode 100755
index 19dc7fd2df..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_moon.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_motorways.png b/OsmAnd/res/drawable-hdpi/ic_action_motorways.png
deleted file mode 100644
index d1f9d0cab7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_motorways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_move_point.png b/OsmAnd/res/drawable-hdpi/ic_action_move_point.png
deleted file mode 100644
index 587c6596d7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_move_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_multiselect.png b/OsmAnd/res/drawable-hdpi/ic_action_multiselect.png
deleted file mode 100644
index 7282b408ba..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_multiselect.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_nautical_depth.png b/OsmAnd/res/drawable-hdpi/ic_action_nautical_depth.png
deleted file mode 100644
index 2be1fb6d06..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_nautical_depth.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_next_field_fill.png b/OsmAnd/res/drawable-hdpi/ic_action_next_field_fill.png
deleted file mode 100644
index cc9ca3f6e8..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_next_field_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_next_field_stroke.png b/OsmAnd/res/drawable-hdpi/ic_action_next_field_stroke.png
deleted file mode 100644
index f5cf1d59d3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_next_field_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_next_turn.png b/OsmAnd/res/drawable-hdpi/ic_action_next_turn.png
deleted file mode 100644
index d6cdde0004..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_next_turn.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_no_route.png b/OsmAnd/res/drawable-hdpi/ic_action_no_route.png
deleted file mode 100644
index b4bb2b9a61..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_no_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_note_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_note_dark.png
deleted file mode 100644
index 3c68eb5abd..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_note_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_opacity.png b/OsmAnd/res/drawable-hdpi/ic_action_opacity.png
deleted file mode 100644
index 882e6deeb2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_opacity.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_opening_hour_16.png b/OsmAnd/res/drawable-hdpi/ic_action_opening_hour_16.png
deleted file mode 100644
index 13db3a2825..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_opening_hour_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_osm_live.png b/OsmAnd/res/drawable-hdpi/ic_action_osm_live.png
deleted file mode 100644
index ce8edb2882..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_osm_live.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_osmand_logo.png b/OsmAnd/res/drawable-hdpi/ic_action_osmand_logo.png
deleted file mode 100644
index f397d64a08..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_osmand_logo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_payment_card.png b/OsmAnd/res/drawable-hdpi/ic_action_payment_card.png
deleted file mode 100644
index 2e574e9d1a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_payment_card.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_phone.png b/OsmAnd/res/drawable-hdpi/ic_action_phone.png
deleted file mode 100644
index 495b28b39f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_phone.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_phone_device_orientation.png b/OsmAnd/res/drawable-hdpi/ic_action_phone_device_orientation.png
deleted file mode 100755
index 7c79af0d64..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_phone_device_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_phone_landscape_orientation.png b/OsmAnd/res/drawable-hdpi/ic_action_phone_landscape_orientation.png
deleted file mode 100755
index f84463a2c8..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_phone_landscape_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_phone_portrait_orientation.png b/OsmAnd/res/drawable-hdpi/ic_action_phone_portrait_orientation.png
deleted file mode 100755
index 236eed20c8..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_phone_portrait_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_placeholder_city.png b/OsmAnd/res/drawable-hdpi/ic_action_placeholder_city.png
deleted file mode 100644
index ce205864ea..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_placeholder_city.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_play_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_play_dark.png
deleted file mode 100644
index 4b9687f83c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_play_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_plus.png b/OsmAnd/res/drawable-hdpi/ic_action_plus.png
deleted file mode 100644
index e7dd633ad7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_plus.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_plus_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_plus_dark.png
deleted file mode 100644
index b1316dbdc7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_plus_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_poi_brand.png b/OsmAnd/res/drawable-hdpi/ic_action_poi_brand.png
deleted file mode 100644
index 672da9fecb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_poi_brand.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_poi_name.png b/OsmAnd/res/drawable-hdpi/ic_action_poi_name.png
deleted file mode 100644
index d606c1b8e4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_poi_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_point_add_destination.png b/OsmAnd/res/drawable-hdpi/ic_action_point_add_destination.png
deleted file mode 100644
index 38bbacbc8d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_point_add_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_point_destination.png b/OsmAnd/res/drawable-hdpi/ic_action_point_destination.png
deleted file mode 100644
index 31f347e7a9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_point_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_point_start.png b/OsmAnd/res/drawable-hdpi/ic_action_point_start.png
deleted file mode 100644
index c686e24e98..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_point_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_postcode.png b/OsmAnd/res/drawable-hdpi/ic_action_postcode.png
deleted file mode 100644
index 81ef5f3037..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_postcode.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_price_tag.png b/OsmAnd/res/drawable-hdpi/ic_action_price_tag.png
deleted file mode 100644
index bed9d16c01..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_price_tag.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_private_access.png b/OsmAnd/res/drawable-hdpi/ic_action_private_access.png
deleted file mode 100755
index 40b27325a4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_proxy.png b/OsmAnd/res/drawable-hdpi/ic_action_proxy.png
deleted file mode 100755
index 86f45fa65e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_proxy.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_qrcode.png b/OsmAnd/res/drawable-hdpi/ic_action_qrcode.png
deleted file mode 100644
index 69d9a4dc85..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_qrcode.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_read_article.png b/OsmAnd/res/drawable-hdpi/ic_action_read_article.png
deleted file mode 100644
index 351a791bb1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_read_article.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_read_later.png b/OsmAnd/res/drawable-hdpi/ic_action_read_later.png
deleted file mode 100644
index 80b3eb478e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_read_later.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_read_later_fill.png b/OsmAnd/res/drawable-hdpi/ic_action_read_later_fill.png
deleted file mode 100644
index 9be0e19c36..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_read_later_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_read_text.png b/OsmAnd/res/drawable-hdpi/ic_action_read_text.png
deleted file mode 100644
index 0e38ce5393..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_read_text.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_rec_start.png b/OsmAnd/res/drawable-hdpi/ic_action_rec_start.png
deleted file mode 100644
index 4531daa84e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_rec_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_rec_stop.png b/OsmAnd/res/drawable-hdpi/ic_action_rec_stop.png
deleted file mode 100644
index eb53313d7d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_rec_stop.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_redo_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_redo_dark.png
deleted file mode 100644
index 9ae1eed751..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_redo_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_refresh_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_refresh_dark.png
deleted file mode 100644
index 1c3b868f07..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_refresh_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_relative_bearing.png b/OsmAnd/res/drawable-hdpi/ic_action_relative_bearing.png
deleted file mode 100644
index ba670652c3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_relative_bearing.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_remove.png b/OsmAnd/res/drawable-hdpi/ic_action_remove.png
deleted file mode 100644
index c814864108..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_remove.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_remove_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_remove_dark.png
deleted file mode 100644
index 718053c411..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_remove_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_remove_small.png b/OsmAnd/res/drawable-hdpi/ic_action_remove_small.png
deleted file mode 100644
index 6e3099f540..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_remove_small.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_reorder.png b/OsmAnd/res/drawable-hdpi/ic_action_reorder.png
deleted file mode 100644
index 1180451a26..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_reorder.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_reset_to_default_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_reset_to_default_dark.png
deleted file mode 100644
index e97474b67c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_reset_to_default_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png
deleted file mode 100644
index 42bde5fbb1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_road_works_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_direction_from_here.png b/OsmAnd/res/drawable-hdpi/ic_action_route_direction_from_here.png
deleted file mode 100644
index 5a3db0e475..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_direction_from_here.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_distance.png b/OsmAnd/res/drawable-hdpi/ic_action_route_distance.png
deleted file mode 100644
index fd22d832b7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_first_intermediate.png b/OsmAnd/res/drawable-hdpi/ic_action_route_first_intermediate.png
deleted file mode 100644
index 8cfd61bc6f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_first_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_first_intermediate_point.png b/OsmAnd/res/drawable-hdpi/ic_action_route_first_intermediate_point.png
deleted file mode 100644
index e1d279d499..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_first_intermediate_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_last_intermediate.png b/OsmAnd/res/drawable-hdpi/ic_action_route_last_intermediate.png
deleted file mode 100644
index cbb1844f96..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_last_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_last_intermediate_point.png b/OsmAnd/res/drawable-hdpi/ic_action_route_last_intermediate_point.png
deleted file mode 100644
index 437fe4edff..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_last_intermediate_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_points.png b/OsmAnd/res/drawable-hdpi/ic_action_route_points.png
deleted file mode 100644
index f4af5e8b30..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_points.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_subsequent_destination.png b/OsmAnd/res/drawable-hdpi/ic_action_route_subsequent_destination.png
deleted file mode 100644
index 4553cd1dd2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_subsequent_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_route_subsequent_destination_point.png b/OsmAnd/res/drawable-hdpi/ic_action_route_subsequent_destination_point.png
deleted file mode 100644
index b1c6ade02e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_route_subsequent_destination_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_ruler_circle.png b/OsmAnd/res/drawable-hdpi/ic_action_ruler_circle.png
deleted file mode 100644
index 1e23ebc472..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_ruler_circle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_ruler_unit.png b/OsmAnd/res/drawable-hdpi/ic_action_ruler_unit.png
deleted file mode 100755
index 4e6d0b951b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_ruler_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sadface.png b/OsmAnd/res/drawable-hdpi/ic_action_sadface.png
deleted file mode 100644
index 030dd69a0a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sadface.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sand_clock.png b/OsmAnd/res/drawable-hdpi/ic_action_sand_clock.png
deleted file mode 100644
index 5aacc19165..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sand_clock.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_save.png b/OsmAnd/res/drawable-hdpi/ic_action_save.png
deleted file mode 100644
index ba67ffd866..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_save.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_save_to_file.png b/OsmAnd/res/drawable-hdpi/ic_action_save_to_file.png
deleted file mode 100644
index f6eb7dd741..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_save_to_file.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_search_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_search_dark.png
deleted file mode 100644
index 2881893508..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_search_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_select_all.png b/OsmAnd/res/drawable-hdpi/ic_action_select_all.png
deleted file mode 100644
index d947820ba0..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_select_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sensor_interaction.png b/OsmAnd/res/drawable-hdpi/ic_action_sensor_interaction.png
deleted file mode 100755
index 90f23a7c3b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sensor_interaction.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_show_along_route.png b/OsmAnd/res/drawable-hdpi/ic_action_show_along_route.png
deleted file mode 100644
index 1afaf4f922..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_show_along_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_show_keypad_left.png b/OsmAnd/res/drawable-hdpi/ic_action_show_keypad_left.png
deleted file mode 100644
index 4623973ac3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_show_keypad_left.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_show_keypad_right.png b/OsmAnd/res/drawable-hdpi/ic_action_show_keypad_right.png
deleted file mode 100644
index 5cac48383a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_show_keypad_right.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_singleselect.png b/OsmAnd/res/drawable-hdpi/ic_action_singleselect.png
deleted file mode 100644
index e82c1826ed..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_singleselect.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_snap_to_road.png b/OsmAnd/res/drawable-hdpi/ic_action_snap_to_road.png
deleted file mode 100644
index cad96b6d11..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_snap_to_road.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_social_facebook.png b/OsmAnd/res/drawable-hdpi/ic_action_social_facebook.png
deleted file mode 100644
index d9f508f58e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_social_facebook.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_social_instagram.png b/OsmAnd/res/drawable-hdpi/ic_action_social_instagram.png
deleted file mode 100644
index 4184ea93e5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_social_instagram.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_social_reddit.png b/OsmAnd/res/drawable-hdpi/ic_action_social_reddit.png
deleted file mode 100644
index 69ddee67eb..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_social_reddit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_social_twitter.png b/OsmAnd/res/drawable-hdpi/ic_action_social_twitter.png
deleted file mode 100644
index 20e4fba710..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_social_twitter.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_social_vk.png b/OsmAnd/res/drawable-hdpi/ic_action_social_vk.png
deleted file mode 100644
index 2614942e1f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_social_vk.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sort_by_date.png b/OsmAnd/res/drawable-hdpi/ic_action_sort_by_date.png
deleted file mode 100644
index 28fedf645a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sort_by_date.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sort_by_name.png b/OsmAnd/res/drawable-hdpi/ic_action_sort_by_name.png
deleted file mode 100644
index cec8a8f9a5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sort_by_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sort_door_to_door.png b/OsmAnd/res/drawable-hdpi/ic_action_sort_door_to_door.png
deleted file mode 100644
index 97fc7e63f7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sort_door_to_door.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sort_reverse_order.png b/OsmAnd/res/drawable-hdpi/ic_action_sort_reverse_order.png
deleted file mode 100644
index 7eaa60a5c7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sort_reverse_order.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_speed.png b/OsmAnd/res/drawable-hdpi/ic_action_speed.png
deleted file mode 100644
index 3d5efa1f9f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_speed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_speed_16.png b/OsmAnd/res/drawable-hdpi/ic_action_speed_16.png
deleted file mode 100644
index 24a526f3e7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_speed_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_speed_limit.png b/OsmAnd/res/drawable-hdpi/ic_action_speed_limit.png
deleted file mode 100644
index 57882eacb1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_speed_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_split_interval.png b/OsmAnd/res/drawable-hdpi/ic_action_split_interval.png
deleted file mode 100644
index 1065af2302..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_split_interval.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png b/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png
deleted file mode 100644
index 05f1981a06..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_start_navigation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_street_name.png b/OsmAnd/res/drawable-hdpi/ic_action_street_name.png
deleted file mode 100644
index c635e2cc0c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_street_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_subscription_osmand_live.png b/OsmAnd/res/drawable-hdpi/ic_action_subscription_osmand_live.png
deleted file mode 100644
index 9ed159d530..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_subscription_osmand_live.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_sun.png b/OsmAnd/res/drawable-hdpi/ic_action_sun.png
deleted file mode 100755
index ca3288a1fa..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_sun.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_target.png b/OsmAnd/res/drawable-hdpi/ic_action_target.png
deleted file mode 100644
index e60d196272..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_target.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_test_light.png b/OsmAnd/res/drawable-hdpi/ic_action_test_light.png
deleted file mode 100644
index 2318f758d4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_test_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_text_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_text_dark.png
deleted file mode 100644
index 8c4d075775..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_text_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time.png b/OsmAnd/res/drawable-hdpi/ic_action_time.png
deleted file mode 100644
index 7fe237faa1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_end.png b/OsmAnd/res/drawable-hdpi/ic_action_time_end.png
deleted file mode 100644
index fcb35514c5..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time_end.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_end_16.png b/OsmAnd/res/drawable-hdpi/ic_action_time_end_16.png
deleted file mode 100644
index dce1706858..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time_end_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_moving_16.png b/OsmAnd/res/drawable-hdpi/ic_action_time_moving_16.png
deleted file mode 100644
index 2b8c535b78..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time_moving_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_span.png b/OsmAnd/res/drawable-hdpi/ic_action_time_span.png
deleted file mode 100644
index 79b3631d87..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time_span.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_span_16.png b/OsmAnd/res/drawable-hdpi/ic_action_time_span_16.png
deleted file mode 100644
index 0980488f9b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time_span_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_start.png b/OsmAnd/res/drawable-hdpi/ic_action_time_start.png
deleted file mode 100644
index 5d4952e50b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_start_16.png b/OsmAnd/res/drawable-hdpi/ic_action_time_start_16.png
deleted file mode 100644
index c732040eaa..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time_start_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_time_to_distance.png b/OsmAnd/res/drawable-hdpi/ic_action_time_to_distance.png
deleted file mode 100644
index dd73ddcb00..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_time_to_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_track_16.png b/OsmAnd/res/drawable-hdpi/ic_action_track_16.png
deleted file mode 100644
index 3115a6582d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_track_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_trip_round.png b/OsmAnd/res/drawable-hdpi/ic_action_trip_round.png
deleted file mode 100644
index 124a766edf..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_trip_round.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_turn_screen_on.png b/OsmAnd/res/drawable-hdpi/ic_action_turn_screen_on.png
deleted file mode 100755
index 466c9d0640..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_turn_screen_on.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_type_add.png b/OsmAnd/res/drawable-hdpi/ic_action_type_add.png
deleted file mode 100644
index 03b90b4894..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_type_add.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_type_add_16.png b/OsmAnd/res/drawable-hdpi/ic_action_type_add_16.png
deleted file mode 100644
index ff4d2d7400..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_type_add_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_type_apply.png b/OsmAnd/res/drawable-hdpi/ic_action_type_apply.png
deleted file mode 100644
index a03c666987..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_type_apply.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_type_delete.png b/OsmAnd/res/drawable-hdpi/ic_action_type_delete.png
deleted file mode 100644
index 91eed5070a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_type_delete.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_type_delete_16.png b/OsmAnd/res/drawable-hdpi/ic_action_type_delete_16.png
deleted file mode 100644
index 1df427fe41..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_type_delete_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_type_edit.png b/OsmAnd/res/drawable-hdpi/ic_action_type_edit.png
deleted file mode 100644
index 6e647a0994..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_type_edit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_type_edit_16.png b/OsmAnd/res/drawable-hdpi/ic_action_type_edit_16.png
deleted file mode 100644
index 8f02b07001..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_type_edit_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_undo.png b/OsmAnd/res/drawable-hdpi/ic_action_undo.png
deleted file mode 100644
index bdbf222d75..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_undo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_undo_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_undo_dark.png
deleted file mode 100644
index 5e4f2f3d63..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_undo_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_unlimited_download.png b/OsmAnd/res/drawable-hdpi/ic_action_unlimited_download.png
deleted file mode 100644
index 6ec40bdb79..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_unlimited_download.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_up_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_up_dark.png
deleted file mode 100644
index aa838e33b6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_up_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_user.png b/OsmAnd/res/drawable-hdpi/ic_action_user.png
deleted file mode 100644
index ed31cb9028..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_user.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_view.png b/OsmAnd/res/drawable-hdpi/ic_action_view.png
deleted file mode 100644
index a494751378..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_view.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-hdpi/ic_action_volume_mute.png
deleted file mode 100755
index 4a3f7ecf16..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_volume_mute.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_volume_up.png b/OsmAnd/res/drawable-hdpi/ic_action_volume_up.png
deleted file mode 100644
index ebd445ed8f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_volume_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-hdpi/ic_action_waypoint.png
deleted file mode 100644
index 5875fac29c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_weight_limit.png b/OsmAnd/res/drawable-hdpi/ic_action_weight_limit.png
deleted file mode 100755
index b52ccf827c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_weight_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_widget_collapse.png b/OsmAnd/res/drawable-hdpi/ic_action_widget_collapse.png
deleted file mode 100644
index ba259e34d2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_widget_collapse.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_width_limit.png b/OsmAnd/res/drawable-hdpi/ic_action_width_limit.png
deleted file mode 100644
index 9e26514e13..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_width_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_wifi_off.png b/OsmAnd/res/drawable-hdpi/ic_action_wifi_off.png
deleted file mode 100644
index 7b3d978848..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_wifi_off.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png
deleted file mode 100644
index 4797780141..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_wikipedia.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_world_globe.png b/OsmAnd/res/drawable-hdpi/ic_action_world_globe.png
deleted file mode 100644
index 0ca58b25b7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_world_globe.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_arrow_back.png b/OsmAnd/res/drawable-hdpi/ic_arrow_back.png
deleted file mode 100644
index 7a975df613..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_arrow_back.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_arrow_forward.png b/OsmAnd/res/drawable-hdpi/ic_arrow_forward.png
deleted file mode 100644
index 1f1bed120a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_arrow_forward.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_arrow_right_16.png b/OsmAnd/res/drawable-hdpi/ic_arrow_right_16.png
deleted file mode 100644
index 389ef827ba..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_arrow_right_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_check_box_dark.png b/OsmAnd/res/drawable-hdpi/ic_check_box_dark.png
deleted file mode 100644
index 7b7b377183..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_check_box_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_check_box_light.png b/OsmAnd/res/drawable-hdpi/ic_check_box_light.png
deleted file mode 100644
index f8490cb878..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_check_box_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_check_box_outline_dark.png b/OsmAnd/res/drawable-hdpi/ic_check_box_outline_dark.png
deleted file mode 100644
index 1e20c78313..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_check_box_outline_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_check_box_outline_light.png b/OsmAnd/res/drawable-hdpi/ic_check_box_outline_light.png
deleted file mode 100644
index 3c9a3d2124..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_check_box_outline_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_christmas_illustration.png b/OsmAnd/res/drawable-hdpi/ic_christmas_illustration.png
deleted file mode 100644
index bf0db3570f..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_christmas_illustration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_crashlog.png b/OsmAnd/res/drawable-hdpi/ic_crashlog.png
deleted file mode 100644
index 22b59704dc..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_crashlog.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_direction_arrow.png b/OsmAnd/res/drawable-hdpi/ic_direction_arrow.png
deleted file mode 100644
index 790efba776..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_direction_arrow.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_dot_position.png b/OsmAnd/res/drawable-hdpi/ic_dot_position.png
deleted file mode 100644
index 907f765860..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_dot_position.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_empty_state_search.png b/OsmAnd/res/drawable-hdpi/ic_empty_state_search.png
deleted file mode 100644
index 92afa84e1c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_empty_state_search.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_extension_dark.png b/OsmAnd/res/drawable-hdpi/ic_extension_dark.png
deleted file mode 100644
index a57ea1619b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_extension_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_flat_list_dark.png b/OsmAnd/res/drawable-hdpi/ic_flat_list_dark.png
deleted file mode 100644
index 1352f23a2e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_flat_list_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_gpx_track.png b/OsmAnd/res/drawable-hdpi/ic_gpx_track.png
deleted file mode 100644
index d53f05c141..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_gpx_track.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_groped_by_type.png b/OsmAnd/res/drawable-hdpi/ic_groped_by_type.png
deleted file mode 100644
index 053d6cec0e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_groped_by_type.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_group.png b/OsmAnd/res/drawable-hdpi/ic_group.png
deleted file mode 100644
index fc1febc665..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_logo_mapillary.png b/OsmAnd/res/drawable-hdpi/ic_logo_mapillary.png
deleted file mode 100644
index d2583fac41..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_logo_mapillary.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_next.png b/OsmAnd/res/drawable-hdpi/ic_next.png
deleted file mode 100644
index d5f6cee246..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_next.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_bug.png b/OsmAnd/res/drawable-hdpi/ic_notification_bug.png
new file mode 100644
index 0000000000..564c70d5f0
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_bug.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_pause.png b/OsmAnd/res/drawable-hdpi/ic_notification_pause.png
new file mode 100644
index 0000000000..06a3de8538
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_pause.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_play.png b/OsmAnd/res/drawable-hdpi/ic_notification_play.png
new file mode 100644
index 0000000000..229cec462f
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_play.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_rec_start.png b/OsmAnd/res/drawable-hdpi/ic_notification_rec_start.png
new file mode 100644
index 0000000000..0f30d5137a
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_rec_start.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_rec_stop.png b/OsmAnd/res/drawable-hdpi/ic_notification_rec_stop.png
new file mode 100644
index 0000000000..b7ef972aca
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_rec_stop.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_remove.png b/OsmAnd/res/drawable-hdpi/ic_notification_remove.png
new file mode 100644
index 0000000000..24628ad308
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_remove.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_save.png b/OsmAnd/res/drawable-hdpi/ic_notification_save.png
new file mode 100644
index 0000000000..b1f8079540
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_save.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_start_navigation.png b/OsmAnd/res/drawable-hdpi/ic_notification_start_navigation.png
new file mode 100644
index 0000000000..32074abb7c
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_notification_track.png b/OsmAnd/res/drawable-hdpi/ic_notification_track.png
new file mode 100644
index 0000000000..0baefc4016
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_notification_track.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_overflow_menu_white.png b/OsmAnd/res/drawable-hdpi/ic_overflow_menu_white.png
deleted file mode 100644
index a0001ebe32..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_overflow_menu_white.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_pause.png b/OsmAnd/res/drawable-hdpi/ic_pause.png
deleted file mode 100644
index b4bdbb5588..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_pause.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_person.png b/OsmAnd/res/drawable-hdpi/ic_person.png
deleted file mode 100644
index 05d4ef6781..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_person.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_play_dark.png b/OsmAnd/res/drawable-hdpi/ic_play_dark.png
deleted file mode 100644
index c25b806686..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_play_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_plugin_accessibility.png b/OsmAnd/res/drawable-hdpi/ic_plugin_accessibility.png
deleted file mode 100644
index d4e461096d..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_plugin_accessibility.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_plugin_developer.png b/OsmAnd/res/drawable-hdpi/ic_plugin_developer.png
deleted file mode 100644
index 75e7aadb63..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_plugin_developer.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_plugin_nautical_map.png b/OsmAnd/res/drawable-hdpi/ic_plugin_nautical_map.png
deleted file mode 100644
index 9e705775db..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_plugin_nautical_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_plugin_wikipedia.png b/OsmAnd/res/drawable-hdpi/ic_plugin_wikipedia.png
deleted file mode 100644
index c926feacf2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_plugin_wikipedia.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_prev.png b/OsmAnd/res/drawable-hdpi/ic_prev.png
deleted file mode 100644
index 86fa3379ff..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_prev.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_sdcard.png b/OsmAnd/res/drawable-hdpi/ic_sdcard.png
deleted file mode 100644
index c72f6aec99..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_sdcard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_sdcard_16.png b/OsmAnd/res/drawable-hdpi/ic_sdcard_16.png
deleted file mode 100644
index 45194b7973..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_sdcard_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_show_on_map.png b/OsmAnd/res/drawable-hdpi/ic_show_on_map.png
deleted file mode 100644
index 9f3046aa00..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_show_on_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_small_distance.png b/OsmAnd/res/drawable-hdpi/ic_small_distance.png
deleted file mode 100644
index 5276886dd1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_small_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_small_group.png b/OsmAnd/res/drawable-hdpi/ic_small_group.png
deleted file mode 100644
index 1ca12287f9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_small_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_small_point.png b/OsmAnd/res/drawable-hdpi/ic_small_point.png
deleted file mode 100644
index 80a383a9b6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_small_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_small_time.png b/OsmAnd/res/drawable-hdpi/ic_small_time.png
deleted file mode 100644
index 8076fa39af..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_small_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_small_turn_left.png b/OsmAnd/res/drawable-hdpi/ic_small_turn_left.png
deleted file mode 100644
index 331c69b7a2..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_small_turn_left.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_small_turn_right.png b/OsmAnd/res/drawable-hdpi/ic_small_turn_right.png
deleted file mode 100644
index 7128180ab4..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_small_turn_right.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_small_warning.png b/OsmAnd/res/drawable-hdpi/ic_small_warning.png
deleted file mode 100644
index 97c711aa54..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_small_warning.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_dark.png b/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_dark.png
deleted file mode 100644
index 053954eef6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_sort_waypoint_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_tree_list_dark.png b/OsmAnd/res/drawable-hdpi/ic_tree_list_dark.png
deleted file mode 100644
index 945c9fa579..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_tree_list_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_address.png b/OsmAnd/res/drawable-hdpi/ic_type_address.png
deleted file mode 100644
index e9f8182179..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_address.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_archive.png b/OsmAnd/res/drawable-hdpi/ic_type_archive.png
deleted file mode 100644
index 8001baecd7..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_archive.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_bug.png b/OsmAnd/res/drawable-hdpi/ic_type_bug.png
deleted file mode 100644
index f8fce6f78b..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_bug.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_coordinates.png b/OsmAnd/res/drawable-hdpi/ic_type_coordinates.png
deleted file mode 100644
index 084b8705c0..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_coordinates.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_favorites.png b/OsmAnd/res/drawable-hdpi/ic_type_favorites.png
deleted file mode 100644
index b0b8bfaf2e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_favorites.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_file.png b/OsmAnd/res/drawable-hdpi/ic_type_file.png
deleted file mode 100644
index 15fa64ea0e..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_file.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_img.png b/OsmAnd/res/drawable-hdpi/ic_type_img.png
deleted file mode 100644
index f7677ae855..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_img.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_info.png b/OsmAnd/res/drawable-hdpi/ic_type_info.png
deleted file mode 100644
index 169264c7c1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_info.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_video.png b/OsmAnd/res/drawable-hdpi/ic_type_video.png
deleted file mode 100644
index d686a0cc58..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_video.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_waypoint.png b/OsmAnd/res/drawable-hdpi/ic_type_waypoint.png
deleted file mode 100644
index 5aa1ba16e3..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_type_waypoints_group.png b/OsmAnd/res/drawable-hdpi/ic_type_waypoints_group.png
deleted file mode 100644
index 702696f5dc..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_type_waypoints_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_warning.png b/OsmAnd/res/drawable-hdpi/ic_warning.png
deleted file mode 100644
index 30eee6c4ec..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_warning.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_world_globe_dark.png b/OsmAnd/res/drawable-hdpi/ic_world_globe_dark.png
deleted file mode 100644
index 0acdc07e7a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/ic_world_globe_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_destination.png b/OsmAnd/res/drawable-hdpi/list_destination.png
deleted file mode 100644
index 78bcf631a9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_intermediate.png b/OsmAnd/res/drawable-hdpi/list_intermediate.png
deleted file mode 100644
index f88f0beaef..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_startpoint.png b/OsmAnd/res/drawable-hdpi/list_startpoint.png
deleted file mode 100644
index aa76244cf1..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_startpoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian.png b/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian.png
deleted file mode 100644
index 38d9544a48..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png b/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png
deleted file mode 100644
index ef0ee38f0c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_pedestrian_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_railways.png b/OsmAnd/res/drawable-hdpi/list_warnings_railways.png
deleted file mode 100644
index 89a942101a..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_railways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png b/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png
deleted file mode 100644
index e6afa66120..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_railways_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_speed_camera.png b/OsmAnd/res/drawable-hdpi/list_warnings_speed_camera.png
deleted file mode 100755
index 3a65575c75..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_speed_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming.png b/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming.png
deleted file mode 100644
index 2c6fe6b58c..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming_us.png b/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming_us.png
deleted file mode 100644
index 8b369ea502..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_tunnel.png b/OsmAnd/res/drawable-hdpi/list_warnings_tunnel.png
deleted file mode 100644
index 04f82eaea6..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_tunnel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-hdpi/list_warnings_tunnel_us.png b/OsmAnd/res/drawable-hdpi/list_warnings_tunnel_us.png
deleted file mode 100644
index b43812a3e9..0000000000
Binary files a/OsmAnd/res/drawable-hdpi/list_warnings_tunnel_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_add_photos.png b/OsmAnd/res/drawable-mdpi/ic_action_add_photos.png
deleted file mode 100644
index a0ca697d85..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_add_photos.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_additional_option.png b/OsmAnd/res/drawable-mdpi/ic_action_additional_option.png
deleted file mode 100644
index 7a57c42ff6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_additional_option.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_addpoint_above.png b/OsmAnd/res/drawable-mdpi/ic_action_addpoint_above.png
deleted file mode 100644
index e330d440ff..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_addpoint_above.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_addpoint_below.png b/OsmAnd/res/drawable-mdpi/ic_action_addpoint_below.png
deleted file mode 100644
index f9928c6118..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_addpoint_below.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_alert.png b/OsmAnd/res/drawable-mdpi/ic_action_alert.png
deleted file mode 100644
index 7a22af5acf..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_alert.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_allow_private_access.png b/OsmAnd/res/drawable-mdpi/ic_action_allow_private_access.png
deleted file mode 100644
index 500496b736..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_allow_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_altitude.png b/OsmAnd/res/drawable-mdpi/ic_action_altitude.png
deleted file mode 100644
index aa795794c8..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_altitude.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_altitude_ascent.png b/OsmAnd/res/drawable-mdpi/ic_action_altitude_ascent.png
deleted file mode 100644
index b0d5461ca7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_altitude_ascent.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_altitude_average.png b/OsmAnd/res/drawable-mdpi/ic_action_altitude_average.png
deleted file mode 100644
index 597e0662c3..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_altitude_average.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_altitude_average_16.png b/OsmAnd/res/drawable-mdpi/ic_action_altitude_average_16.png
deleted file mode 100644
index 5e9b08d079..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_altitude_average_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_altitude_descent.png b/OsmAnd/res/drawable-mdpi/ic_action_altitude_descent.png
deleted file mode 100644
index a2221d0779..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_altitude_descent.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_altitude_descent_ascent_16.png b/OsmAnd/res/drawable-mdpi/ic_action_altitude_descent_ascent_16.png
deleted file mode 100644
index e4c4cf98e0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_altitude_descent_ascent_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_altitude_range_16.png b/OsmAnd/res/drawable-mdpi/ic_action_altitude_range_16.png
deleted file mode 100644
index e18fdeb165..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_altitude_range_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_angular_unit.png b/OsmAnd/res/drawable-mdpi/ic_action_angular_unit.png
deleted file mode 100755
index 960dfa1f84..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_angular_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_app_configuration.png b/OsmAnd/res/drawable-mdpi/ic_action_app_configuration.png
deleted file mode 100644
index cd6c84ed9f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_app_configuration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_appearance.png b/OsmAnd/res/drawable-mdpi/ic_action_appearance.png
deleted file mode 100644
index b63bf3c366..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_appearance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_arrow_down.png b/OsmAnd/res/drawable-mdpi/ic_action_arrow_down.png
deleted file mode 100644
index 79b2ee6382..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_arrow_down.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_arrow_drop_down.png b/OsmAnd/res/drawable-mdpi/ic_action_arrow_drop_down.png
deleted file mode 100644
index 79f4ad1ce5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_arrow_drop_down.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_arrow_drop_up.png b/OsmAnd/res/drawable-mdpi/ic_action_arrow_drop_up.png
deleted file mode 100644
index 9eb6e5c4f4..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_arrow_drop_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_arrow_forward_16.png b/OsmAnd/res/drawable-mdpi/ic_action_arrow_forward_16.png
deleted file mode 100644
index dbc6437f3d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_arrow_forward_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_arrow_up.png b/OsmAnd/res/drawable-mdpi/ic_action_arrow_up.png
deleted file mode 100644
index 0b72c08501..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_arrow_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_avoid_motorways.png b/OsmAnd/res/drawable-mdpi/ic_action_avoid_motorways.png
deleted file mode 100644
index 643f3d8b60..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_avoid_motorways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_backspace_fill.png b/OsmAnd/res/drawable-mdpi/ic_action_backspace_fill.png
deleted file mode 100644
index 1d7ebf6b78..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_backspace_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_backspace_stroke.png b/OsmAnd/res/drawable-mdpi/ic_action_backspace_stroke.png
deleted file mode 100644
index 5fc7873511..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_backspace_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_battery.png b/OsmAnd/res/drawable-mdpi/ic_action_battery.png
deleted file mode 100644
index 0ddf32e3d7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_battery.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_bearing.png b/OsmAnd/res/drawable-mdpi/ic_action_bearing.png
deleted file mode 100644
index a0745f4431..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_bearing.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_bearing_16.png b/OsmAnd/res/drawable-mdpi/ic_action_bearing_16.png
deleted file mode 100644
index 8a42685180..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_bearing_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_big_feedback.png b/OsmAnd/res/drawable-mdpi/ic_action_big_feedback.png
deleted file mode 100644
index 553a556d92..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_big_feedback.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_big_poll.png b/OsmAnd/res/drawable-mdpi/ic_action_big_poll.png
deleted file mode 100644
index 77c2a72ff0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_big_poll.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_bitcoin.png b/OsmAnd/res/drawable-mdpi/ic_action_bitcoin.png
deleted file mode 100644
index 0068711c05..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_bitcoin.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_building.png b/OsmAnd/res/drawable-mdpi/ic_action_building.png
deleted file mode 100644
index 7431f97a65..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_building.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_building_number.png b/OsmAnd/res/drawable-mdpi/ic_action_building_number.png
deleted file mode 100644
index 6a05e6b530..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_building_number.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_call_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_call_dark.png
deleted file mode 100644
index 4e94ece1f6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_call_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_change_navigation_points.png b/OsmAnd/res/drawable-mdpi/ic_action_change_navigation_points.png
deleted file mode 100644
index d5eacf8704..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_change_navigation_points.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_circle.png b/OsmAnd/res/drawable-mdpi/ic_action_circle.png
deleted file mode 100644
index 1f06a09173..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_circle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_clear_all.png b/OsmAnd/res/drawable-mdpi/ic_action_clear_all.png
deleted file mode 100644
index a1fb81e6f1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_clear_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_clear_all_fields.png b/OsmAnd/res/drawable-mdpi/ic_action_clear_all_fields.png
deleted file mode 100644
index c10a1805b4..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_clear_all_fields.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_close_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_close_dark.png
deleted file mode 100644
index b177e05fa5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_close_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_compass.png b/OsmAnd/res/drawable-mdpi/ic_action_compass.png
deleted file mode 100644
index 24156e2e2c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_contents.png b/OsmAnd/res/drawable-mdpi/ic_action_contents.png
deleted file mode 100644
index 744a0775cf..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_contents.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_cuisine.png b/OsmAnd/res/drawable-mdpi/ic_action_cuisine.png
deleted file mode 100644
index d41063269f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_cuisine.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_data.png b/OsmAnd/res/drawable-mdpi/ic_action_data.png
deleted file mode 100644
index 7c3c542a9d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_data.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_description.png b/OsmAnd/res/drawable-mdpi/ic_action_description.png
deleted file mode 100644
index 37023f7eed..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_description.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_deselect_all.png b/OsmAnd/res/drawable-mdpi/ic_action_deselect_all.png
deleted file mode 100644
index d6320ccecd..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_deselect_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_camera.png b/OsmAnd/res/drawable-mdpi/ic_action_device_camera.png
deleted file mode 100644
index f9e1b79c17..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_device_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_top.png b/OsmAnd/res/drawable-mdpi/ic_action_device_top.png
deleted file mode 100644
index d3e1ebe719..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_device_top.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_topbar.png b/OsmAnd/res/drawable-mdpi/ic_action_device_topbar.png
deleted file mode 100644
index 91e5a0904d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_device_topbar.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_topbar_two.png b/OsmAnd/res/drawable-mdpi/ic_action_device_topbar_two.png
deleted file mode 100644
index 547d66eaa9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_device_topbar_two.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_widget.png b/OsmAnd/res/drawable-mdpi/ic_action_device_widget.png
deleted file mode 100644
index 3182f3c1a9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_device_widget.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_device_widget_two.png b/OsmAnd/res/drawable-mdpi/ic_action_device_widget_two.png
deleted file mode 100644
index 413a5d1d2e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_device_widget_two.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_direction_compass.png b/OsmAnd/res/drawable-mdpi/ic_action_direction_compass.png
deleted file mode 100755
index 38dedfe778..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_direction_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_direction_movement.png b/OsmAnd/res/drawable-mdpi/ic_action_direction_movement.png
deleted file mode 100755
index 3139126d10..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_direction_movement.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_direction_north.png b/OsmAnd/res/drawable-mdpi/ic_action_direction_north.png
deleted file mode 100755
index 5628018626..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_direction_north.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_display_position_bottom.png b/OsmAnd/res/drawable-mdpi/ic_action_display_position_bottom.png
deleted file mode 100644
index 9f82ccc238..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_display_position_bottom.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_display_position_center.png b/OsmAnd/res/drawable-mdpi/ic_action_display_position_center.png
deleted file mode 100644
index f1571740ca..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_display_position_center.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_done.png b/OsmAnd/res/drawable-mdpi/ic_action_done.png
deleted file mode 100644
index d8b9baaf89..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_done.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_down_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_down_dark.png
deleted file mode 100644
index 88049388cf..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_down_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png
deleted file mode 100644
index 2ad91ead2e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_elevation.png b/OsmAnd/res/drawable-mdpi/ic_action_elevation.png
deleted file mode 100644
index c5419d9164..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_elevation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_explore.png b/OsmAnd/res/drawable-mdpi/ic_action_explore.png
deleted file mode 100644
index aae68582d5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_explore.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_export.png b/OsmAnd/res/drawable-mdpi/ic_action_export.png
deleted file mode 100644
index dfe75ee462..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_export.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fastest_route.png b/OsmAnd/res/drawable-mdpi/ic_action_fastest_route.png
deleted file mode 100755
index a6fd0bd47f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_fastest_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_filter.png b/OsmAnd/res/drawable-mdpi/ic_action_filter.png
deleted file mode 100644
index 4e7085d6a9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_filter.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_filter_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_filter_dark.png
deleted file mode 100644
index 2cebb4fc80..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_folder.png b/OsmAnd/res/drawable-mdpi/ic_action_folder.png
deleted file mode 100644
index 50acda356e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_folder.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_folder_move.png b/OsmAnd/res/drawable-mdpi/ic_action_folder_move.png
deleted file mode 100755
index 9865c78515..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_folder_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_folder_stroke.png b/OsmAnd/res/drawable-mdpi/ic_action_folder_stroke.png
deleted file mode 100644
index 5bb047ad45..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_folder_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_forbid_private_access.png b/OsmAnd/res/drawable-mdpi/ic_action_forbid_private_access.png
deleted file mode 100644
index 4b7db66c7f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_forbid_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fps.png b/OsmAnd/res/drawable-mdpi/ic_action_fps.png
deleted file mode 100644
index b718e54105..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_fps.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_fuel.png b/OsmAnd/res/drawable-mdpi/ic_action_fuel.png
deleted file mode 100644
index d3d12983d2..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_fuel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gabout_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gabout_dark.png
deleted file mode 100644
index 25ad8f109d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gabout_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gdirections_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gdirections_dark.png
deleted file mode 100644
index 4dd4a94c35..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gdirections_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_get_my_location.png b/OsmAnd/res/drawable-mdpi/ic_action_get_my_location.png
deleted file mode 100644
index 570e408c2e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_get_my_location.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gift.png b/OsmAnd/res/drawable-mdpi/ic_action_gift.png
deleted file mode 100644
index 343e4c3cac..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gift.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gnew_label_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gnew_label_dark.png
deleted file mode 100644
index afe7df111d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gnew_label_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gps_info.png b/OsmAnd/res/drawable-mdpi/ic_action_gps_info.png
deleted file mode 100644
index e1dbf664c0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gps_info.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_bold.png b/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_bold.png
deleted file mode 100644
index f91b0d998e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_bold.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_medium.png b/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_medium.png
deleted file mode 100644
index 833f04abfd..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_medium.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_thin.png b/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_thin.png
deleted file mode 100644
index 6488792951..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gpx_width_thin.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gremove_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gremove_dark.png
deleted file mode 100644
index cb8be6146a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gremove_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_group2.png b/OsmAnd/res/drawable-mdpi/ic_action_group2.png
deleted file mode 100644
index 8c768be1f3..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_group2.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_group_name_16.png b/OsmAnd/res/drawable-mdpi/ic_action_group_name_16.png
deleted file mode 100644
index 44f152b095..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_group_name_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_group_select_all.png b/OsmAnd/res/drawable-mdpi/ic_action_group_select_all.png
deleted file mode 100644
index 5a3ed1d0f5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_group_select_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_height_limit.png b/OsmAnd/res/drawable-mdpi/ic_action_height_limit.png
deleted file mode 100755
index 2c850d1828..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_height_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_help.png b/OsmAnd/res/drawable-mdpi/ic_action_help.png
deleted file mode 100644
index b6da475563..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_help.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_hide.png b/OsmAnd/res/drawable-mdpi/ic_action_hide.png
deleted file mode 100644
index 8baf75aeac..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_hide.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_hillshade_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_hillshade_dark.png
deleted file mode 100644
index b11a362f4f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_hillshade_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_history.png b/OsmAnd/res/drawable-mdpi/ic_action_history.png
deleted file mode 100644
index 686d138882..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_history.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_history2.png b/OsmAnd/res/drawable-mdpi/ic_action_history2.png
deleted file mode 100644
index 31aa48a63b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_history2.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_intermediate.png b/OsmAnd/res/drawable-mdpi/ic_action_intermediate.png
deleted file mode 100644
index 30389a6d36..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_intermediate_destination.png b/OsmAnd/res/drawable-mdpi/ic_action_intermediate_destination.png
deleted file mode 100644
index 6727d910c0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_intermediate_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_intermediate_destination_time.png b/OsmAnd/res/drawable-mdpi/ic_action_intermediate_destination_time.png
deleted file mode 100644
index 606be4e342..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_intermediate_destination_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_internet_access_fee.png b/OsmAnd/res/drawable-mdpi/ic_action_internet_access_fee.png
deleted file mode 100644
index 93d10a9182..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_internet_access_fee.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_intersection.png b/OsmAnd/res/drawable-mdpi/ic_action_intersection.png
deleted file mode 100644
index da64b0a7c9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_intersection.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_item_move.png b/OsmAnd/res/drawable-mdpi/ic_action_item_move.png
deleted file mode 100644
index f3b8367a18..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_item_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_keyboard.png b/OsmAnd/res/drawable-mdpi/ic_action_keyboard.png
deleted file mode 100644
index 3a8ce839ea..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_keyboard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_keyboard_hide.png b/OsmAnd/res/drawable-mdpi/ic_action_keyboard_hide.png
deleted file mode 100644
index 0929302813..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_keyboard_hide.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_label.png b/OsmAnd/res/drawable-mdpi/ic_action_label.png
deleted file mode 100644
index f94bf51d4f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_label.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_lanes.png b/OsmAnd/res/drawable-mdpi/ic_action_lanes.png
deleted file mode 100755
index 7e929ee7d0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_lanes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_list_bullet.png b/OsmAnd/res/drawable-mdpi/ic_action_list_bullet.png
deleted file mode 100644
index fe5a72b68a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_list_bullet.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_list_header.png b/OsmAnd/res/drawable-mdpi/ic_action_list_header.png
deleted file mode 100644
index b03c9e3bb5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_list_header.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_list_sort.png b/OsmAnd/res/drawable-mdpi/ic_action_list_sort.png
deleted file mode 100644
index 06033eea98..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_list_sort.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_location_color.png b/OsmAnd/res/drawable-mdpi/ic_action_location_color.png
deleted file mode 100644
index 17396f3620..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_location_color.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_location_color_lost.png b/OsmAnd/res/drawable-mdpi/ic_action_location_color_lost.png
deleted file mode 100644
index 4a21a9d001..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_location_color_lost.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_location_off.png b/OsmAnd/res/drawable-mdpi/ic_action_location_off.png
deleted file mode 100644
index a8696fdf1b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_location_off.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_location_sharing_app.png b/OsmAnd/res/drawable-mdpi/ic_action_location_sharing_app.png
deleted file mode 100644
index aa1dad256d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_location_sharing_app.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_day.png b/OsmAnd/res/drawable-mdpi/ic_action_map_day.png
deleted file mode 100644
index 52ba02753f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_language.png b/OsmAnd/res/drawable-mdpi/ic_action_map_language.png
deleted file mode 100644
index a45291b345..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_language.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_light_sensor.png b/OsmAnd/res/drawable-mdpi/ic_action_map_light_sensor.png
deleted file mode 100644
index f5a3e27f0f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_light_sensor.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_magnifier.png b/OsmAnd/res/drawable-mdpi/ic_action_map_magnifier.png
deleted file mode 100644
index 8033ec45c6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_magnifier.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_night.png b/OsmAnd/res/drawable-mdpi/ic_action_map_night.png
deleted file mode 100644
index e17bb1fa92..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_routes.png b/OsmAnd/res/drawable-mdpi/ic_action_map_routes.png
deleted file mode 100644
index bf86f2024c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_routes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_sunset.png b/OsmAnd/res/drawable-mdpi/ic_action_map_sunset.png
deleted file mode 100755
index f7209c9b66..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_sunset.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_map_text_size.png b/OsmAnd/res/drawable-mdpi/ic_action_map_text_size.png
deleted file mode 100644
index 240a536c66..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_map_text_size.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_mapillary.png b/OsmAnd/res/drawable-mdpi/ic_action_mapillary.png
deleted file mode 100644
index d96e06cd1a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_mapillary.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_marker_passed.png b/OsmAnd/res/drawable-mdpi/ic_action_marker_passed.png
deleted file mode 100644
index 387037d814..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_marker_passed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_markers_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_markers_dark.png
deleted file mode 100644
index 6cfdf96823..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_markers_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_markers_list.png b/OsmAnd/res/drawable-mdpi/ic_action_markers_list.png
deleted file mode 100644
index 2458489296..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_markers_list.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_max_speed.png b/OsmAnd/res/drawable-mdpi/ic_action_max_speed.png
deleted file mode 100644
index c778a8ee74..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_max_speed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_max_speed_16.png b/OsmAnd/res/drawable-mdpi/ic_action_max_speed_16.png
deleted file mode 100644
index f8f950b7bc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_max_speed_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_measure_point.png b/OsmAnd/res/drawable-mdpi/ic_action_measure_point.png
deleted file mode 100644
index 55cf7aa129..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_measure_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_message.png b/OsmAnd/res/drawable-mdpi/ic_action_message.png
deleted file mode 100644
index 3ebdecc37d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_message.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_minimize.png b/OsmAnd/res/drawable-mdpi/ic_action_minimize.png
deleted file mode 100644
index 01a9141a53..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_minimize.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_moon.png b/OsmAnd/res/drawable-mdpi/ic_action_moon.png
deleted file mode 100755
index 41e0de652f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_moon.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_motorways.png b/OsmAnd/res/drawable-mdpi/ic_action_motorways.png
deleted file mode 100644
index cb91768a09..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_motorways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_move_point.png b/OsmAnd/res/drawable-mdpi/ic_action_move_point.png
deleted file mode 100644
index b1e5375e30..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_move_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_multiselect.png b/OsmAnd/res/drawable-mdpi/ic_action_multiselect.png
deleted file mode 100644
index 74e50f47fc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_multiselect.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_nautical_depth.png b/OsmAnd/res/drawable-mdpi/ic_action_nautical_depth.png
deleted file mode 100644
index 536f58dac3..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_nautical_depth.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_next_field_fill.png b/OsmAnd/res/drawable-mdpi/ic_action_next_field_fill.png
deleted file mode 100644
index d820520b58..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_next_field_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_next_field_stroke.png b/OsmAnd/res/drawable-mdpi/ic_action_next_field_stroke.png
deleted file mode 100644
index 12383778ba..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_next_field_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_next_turn.png b/OsmAnd/res/drawable-mdpi/ic_action_next_turn.png
deleted file mode 100644
index ccbfa5ee20..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_next_turn.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_no_route.png b/OsmAnd/res/drawable-mdpi/ic_action_no_route.png
deleted file mode 100644
index 91162d59fa..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_no_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_note_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_note_dark.png
deleted file mode 100644
index 3599dd9816..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_note_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_opacity.png b/OsmAnd/res/drawable-mdpi/ic_action_opacity.png
deleted file mode 100644
index bf81461b10..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_opacity.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_opening_hour_16.png b/OsmAnd/res/drawable-mdpi/ic_action_opening_hour_16.png
deleted file mode 100644
index 704e215e7c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_opening_hour_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_osm_live.png b/OsmAnd/res/drawable-mdpi/ic_action_osm_live.png
deleted file mode 100644
index bafbf5515a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_osm_live.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_osmand_logo.png b/OsmAnd/res/drawable-mdpi/ic_action_osmand_logo.png
deleted file mode 100644
index 63c914f260..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_osmand_logo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_payment_card.png b/OsmAnd/res/drawable-mdpi/ic_action_payment_card.png
deleted file mode 100644
index bf4a473c26..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_payment_card.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_phone.png b/OsmAnd/res/drawable-mdpi/ic_action_phone.png
deleted file mode 100755
index 723b64a8ec..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_phone.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_phone_device_orientation.png b/OsmAnd/res/drawable-mdpi/ic_action_phone_device_orientation.png
deleted file mode 100755
index ff2a433d08..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_phone_device_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_phone_landscape_orientation.png b/OsmAnd/res/drawable-mdpi/ic_action_phone_landscape_orientation.png
deleted file mode 100755
index 742d488290..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_phone_landscape_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_phone_portrait_orientation.png b/OsmAnd/res/drawable-mdpi/ic_action_phone_portrait_orientation.png
deleted file mode 100755
index dc082673ac..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_phone_portrait_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_placeholder_city.png b/OsmAnd/res/drawable-mdpi/ic_action_placeholder_city.png
deleted file mode 100644
index bcabdb0a88..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_placeholder_city.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_play_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_play_dark.png
deleted file mode 100644
index f4302dfa8e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_play_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_plus.png b/OsmAnd/res/drawable-mdpi/ic_action_plus.png
deleted file mode 100644
index 3461741ffc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_plus.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_plus_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_plus_dark.png
deleted file mode 100644
index 888008a2ce..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_plus_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_poi_brand.png b/OsmAnd/res/drawable-mdpi/ic_action_poi_brand.png
deleted file mode 100644
index e12ac0838c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_poi_brand.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_poi_name.png b/OsmAnd/res/drawable-mdpi/ic_action_poi_name.png
deleted file mode 100644
index 26b17a6785..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_poi_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_point_add_destination.png b/OsmAnd/res/drawable-mdpi/ic_action_point_add_destination.png
deleted file mode 100644
index c33ff18eca..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_point_add_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_point_destination.png b/OsmAnd/res/drawable-mdpi/ic_action_point_destination.png
deleted file mode 100644
index 3cd0592113..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_point_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_point_start.png b/OsmAnd/res/drawable-mdpi/ic_action_point_start.png
deleted file mode 100644
index 7cae0d22e6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_point_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_postcode.png b/OsmAnd/res/drawable-mdpi/ic_action_postcode.png
deleted file mode 100644
index 43d232cf08..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_postcode.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_price_tag.png b/OsmAnd/res/drawable-mdpi/ic_action_price_tag.png
deleted file mode 100644
index 901bdf0753..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_price_tag.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_private_access.png b/OsmAnd/res/drawable-mdpi/ic_action_private_access.png
deleted file mode 100755
index c2b8062b30..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_proxy.png b/OsmAnd/res/drawable-mdpi/ic_action_proxy.png
deleted file mode 100755
index e5bc8c5059..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_proxy.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_qrcode.png b/OsmAnd/res/drawable-mdpi/ic_action_qrcode.png
deleted file mode 100644
index 1887e6f2a5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_qrcode.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_read_article.png b/OsmAnd/res/drawable-mdpi/ic_action_read_article.png
deleted file mode 100644
index c94dbc2eba..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_read_article.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_read_later.png b/OsmAnd/res/drawable-mdpi/ic_action_read_later.png
deleted file mode 100644
index c538c1ddf2..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_read_later.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_read_later_fill.png b/OsmAnd/res/drawable-mdpi/ic_action_read_later_fill.png
deleted file mode 100644
index ca5a5fcda1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_read_later_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_read_text.png b/OsmAnd/res/drawable-mdpi/ic_action_read_text.png
deleted file mode 100644
index 54e5382c68..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_read_text.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_rec_start.png b/OsmAnd/res/drawable-mdpi/ic_action_rec_start.png
deleted file mode 100644
index 01ae53fc8b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_rec_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_rec_stop.png b/OsmAnd/res/drawable-mdpi/ic_action_rec_stop.png
deleted file mode 100644
index 964df0769e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_rec_stop.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_redo_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_redo_dark.png
deleted file mode 100644
index 6fdd01ffbc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_redo_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_refresh_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_refresh_dark.png
deleted file mode 100644
index a014d9f7cc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_refresh_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_relative_bearing.png b/OsmAnd/res/drawable-mdpi/ic_action_relative_bearing.png
deleted file mode 100644
index 9b5d12d9dc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_relative_bearing.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_remove.png b/OsmAnd/res/drawable-mdpi/ic_action_remove.png
deleted file mode 100644
index 92773c92a9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_remove.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_remove_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_remove_dark.png
deleted file mode 100644
index 939f58b193..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_remove_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_remove_small.png b/OsmAnd/res/drawable-mdpi/ic_action_remove_small.png
deleted file mode 100644
index 62fce5d1a2..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_remove_small.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_reorder.png b/OsmAnd/res/drawable-mdpi/ic_action_reorder.png
deleted file mode 100644
index 6a730249db..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_reorder.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_reset_to_default_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_reset_to_default_dark.png
deleted file mode 100644
index badbab8b9d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_reset_to_default_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png
deleted file mode 100644
index 80783fc6ca..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_road_works_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_direction_from_here.png b/OsmAnd/res/drawable-mdpi/ic_action_route_direction_from_here.png
deleted file mode 100644
index 244f3de134..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_direction_from_here.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_distance.png b/OsmAnd/res/drawable-mdpi/ic_action_route_distance.png
deleted file mode 100644
index 5ed3fe5e9d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_first_intermediate.png b/OsmAnd/res/drawable-mdpi/ic_action_route_first_intermediate.png
deleted file mode 100644
index 8b30f6df2a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_first_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_first_intermediate_point.png b/OsmAnd/res/drawable-mdpi/ic_action_route_first_intermediate_point.png
deleted file mode 100644
index 5912472255..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_first_intermediate_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_last_intermediate.png b/OsmAnd/res/drawable-mdpi/ic_action_route_last_intermediate.png
deleted file mode 100644
index d3d48140bb..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_last_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_last_intermediate_point.png b/OsmAnd/res/drawable-mdpi/ic_action_route_last_intermediate_point.png
deleted file mode 100644
index 4b527ea9bc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_last_intermediate_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_points.png b/OsmAnd/res/drawable-mdpi/ic_action_route_points.png
deleted file mode 100644
index 8bbb1d4988..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_points.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_subsequent_destination.png b/OsmAnd/res/drawable-mdpi/ic_action_route_subsequent_destination.png
deleted file mode 100644
index 4fa49beb3d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_subsequent_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_route_subsequent_destination_point.png b/OsmAnd/res/drawable-mdpi/ic_action_route_subsequent_destination_point.png
deleted file mode 100644
index 2693dff551..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_route_subsequent_destination_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_ruler_circle.png b/OsmAnd/res/drawable-mdpi/ic_action_ruler_circle.png
deleted file mode 100644
index e2c26873a5..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_ruler_circle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_ruler_unit.png b/OsmAnd/res/drawable-mdpi/ic_action_ruler_unit.png
deleted file mode 100755
index fe4ff58402..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_ruler_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sadface.png b/OsmAnd/res/drawable-mdpi/ic_action_sadface.png
deleted file mode 100644
index d23eecfdb6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sadface.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sand_clock.png b/OsmAnd/res/drawable-mdpi/ic_action_sand_clock.png
deleted file mode 100644
index a0590dab76..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sand_clock.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_save.png b/OsmAnd/res/drawable-mdpi/ic_action_save.png
deleted file mode 100644
index 3046077715..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_save.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_save_to_file.png b/OsmAnd/res/drawable-mdpi/ic_action_save_to_file.png
deleted file mode 100644
index b66fe1027c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_save_to_file.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_search_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_search_dark.png
deleted file mode 100644
index 0dda6bece7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_search_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_select_all.png b/OsmAnd/res/drawable-mdpi/ic_action_select_all.png
deleted file mode 100644
index f6ad7420c7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_select_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sensor_interaction.png b/OsmAnd/res/drawable-mdpi/ic_action_sensor_interaction.png
deleted file mode 100755
index bafb2800ff..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sensor_interaction.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_show_along_route.png b/OsmAnd/res/drawable-mdpi/ic_action_show_along_route.png
deleted file mode 100644
index 59994b22f8..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_show_along_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_show_keypad_left.png b/OsmAnd/res/drawable-mdpi/ic_action_show_keypad_left.png
deleted file mode 100644
index ffbc23848b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_show_keypad_left.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_show_keypad_right.png b/OsmAnd/res/drawable-mdpi/ic_action_show_keypad_right.png
deleted file mode 100644
index 9388e7a4c7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_show_keypad_right.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_singleselect.png b/OsmAnd/res/drawable-mdpi/ic_action_singleselect.png
deleted file mode 100644
index 7cddcdb299..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_singleselect.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_snap_to_road.png b/OsmAnd/res/drawable-mdpi/ic_action_snap_to_road.png
deleted file mode 100644
index 63f5b358c9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_snap_to_road.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_social_facebook.png b/OsmAnd/res/drawable-mdpi/ic_action_social_facebook.png
deleted file mode 100644
index e00990eac7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_social_facebook.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_social_instagram.png b/OsmAnd/res/drawable-mdpi/ic_action_social_instagram.png
deleted file mode 100644
index b060f74b41..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_social_instagram.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_social_reddit.png b/OsmAnd/res/drawable-mdpi/ic_action_social_reddit.png
deleted file mode 100644
index d2a430ef08..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_social_reddit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_social_twitter.png b/OsmAnd/res/drawable-mdpi/ic_action_social_twitter.png
deleted file mode 100644
index a719f4859f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_social_twitter.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_social_vk.png b/OsmAnd/res/drawable-mdpi/ic_action_social_vk.png
deleted file mode 100644
index d31bec0b18..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_social_vk.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sort_by_date.png b/OsmAnd/res/drawable-mdpi/ic_action_sort_by_date.png
deleted file mode 100644
index 2d12797663..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sort_by_date.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sort_by_name.png b/OsmAnd/res/drawable-mdpi/ic_action_sort_by_name.png
deleted file mode 100644
index ed78380e2d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sort_by_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sort_door_to_door.png b/OsmAnd/res/drawable-mdpi/ic_action_sort_door_to_door.png
deleted file mode 100644
index e4bda56bd1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sort_door_to_door.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sort_reverse_order.png b/OsmAnd/res/drawable-mdpi/ic_action_sort_reverse_order.png
deleted file mode 100644
index 0027b2720a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sort_reverse_order.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_speed.png b/OsmAnd/res/drawable-mdpi/ic_action_speed.png
deleted file mode 100644
index a6de19816e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_speed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_speed_16.png b/OsmAnd/res/drawable-mdpi/ic_action_speed_16.png
deleted file mode 100644
index f2f961ecce..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_speed_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_speed_limit.png b/OsmAnd/res/drawable-mdpi/ic_action_speed_limit.png
deleted file mode 100644
index 15eff937c6..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_speed_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_split_interval.png b/OsmAnd/res/drawable-mdpi/ic_action_split_interval.png
deleted file mode 100644
index 960ce56840..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_split_interval.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png b/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png
deleted file mode 100644
index d145134e9e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_start_navigation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_street_name.png b/OsmAnd/res/drawable-mdpi/ic_action_street_name.png
deleted file mode 100644
index 4350f3cb4c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_street_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_sun.png b/OsmAnd/res/drawable-mdpi/ic_action_sun.png
deleted file mode 100755
index b149cfa1ac..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_sun.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_target.png b/OsmAnd/res/drawable-mdpi/ic_action_target.png
deleted file mode 100644
index 8b65c685a9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_target.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_test_light.png b/OsmAnd/res/drawable-mdpi/ic_action_test_light.png
deleted file mode 100644
index b15d10bd6d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_test_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_text_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_text_dark.png
deleted file mode 100644
index ff28076daf..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_text_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time.png b/OsmAnd/res/drawable-mdpi/ic_action_time.png
deleted file mode 100644
index bcb67a5fa3..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_end.png b/OsmAnd/res/drawable-mdpi/ic_action_time_end.png
deleted file mode 100644
index 1f71d0e8bf..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time_end.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_end_16.png b/OsmAnd/res/drawable-mdpi/ic_action_time_end_16.png
deleted file mode 100644
index 6b752f1fc7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time_end_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_moving_16.png b/OsmAnd/res/drawable-mdpi/ic_action_time_moving_16.png
deleted file mode 100644
index 1e45bcc8d3..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time_moving_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_span.png b/OsmAnd/res/drawable-mdpi/ic_action_time_span.png
deleted file mode 100644
index 43c2ec6ca8..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time_span.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_span_16.png b/OsmAnd/res/drawable-mdpi/ic_action_time_span_16.png
deleted file mode 100644
index 0fa88b208d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time_span_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_start.png b/OsmAnd/res/drawable-mdpi/ic_action_time_start.png
deleted file mode 100644
index 4ddb85ba24..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_start_16.png b/OsmAnd/res/drawable-mdpi/ic_action_time_start_16.png
deleted file mode 100644
index 320250a064..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time_start_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_time_to_distance.png b/OsmAnd/res/drawable-mdpi/ic_action_time_to_distance.png
deleted file mode 100644
index 4d06fe0548..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_time_to_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_track_16.png b/OsmAnd/res/drawable-mdpi/ic_action_track_16.png
deleted file mode 100644
index bc089fd0c9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_track_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_trip_round.png b/OsmAnd/res/drawable-mdpi/ic_action_trip_round.png
deleted file mode 100644
index db60011680..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_trip_round.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_turn_screen_on.png b/OsmAnd/res/drawable-mdpi/ic_action_turn_screen_on.png
deleted file mode 100755
index 274952294c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_turn_screen_on.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_type_add.png b/OsmAnd/res/drawable-mdpi/ic_action_type_add.png
deleted file mode 100644
index 925683ed91..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_type_add.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_type_add_16.png b/OsmAnd/res/drawable-mdpi/ic_action_type_add_16.png
deleted file mode 100644
index db1826da8b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_type_add_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_type_apply.png b/OsmAnd/res/drawable-mdpi/ic_action_type_apply.png
deleted file mode 100644
index 9dfe937264..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_type_apply.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_type_delete.png b/OsmAnd/res/drawable-mdpi/ic_action_type_delete.png
deleted file mode 100644
index c9e7783fb1..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_type_delete.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_type_delete_16.png b/OsmAnd/res/drawable-mdpi/ic_action_type_delete_16.png
deleted file mode 100644
index 4cd6c72dd2..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_type_delete_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_type_edit.png b/OsmAnd/res/drawable-mdpi/ic_action_type_edit.png
deleted file mode 100644
index 76a126e721..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_type_edit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_type_edit_16.png b/OsmAnd/res/drawable-mdpi/ic_action_type_edit_16.png
deleted file mode 100644
index a33538c185..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_type_edit_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_undo.png b/OsmAnd/res/drawable-mdpi/ic_action_undo.png
deleted file mode 100644
index ac8afe991a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_undo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_undo_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_undo_dark.png
deleted file mode 100644
index 9645c7e26c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_undo_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_unlimited_download.png b/OsmAnd/res/drawable-mdpi/ic_action_unlimited_download.png
deleted file mode 100644
index 01cbc6aa57..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_unlimited_download.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_up_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_up_dark.png
deleted file mode 100644
index 36cf72f067..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_up_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_user.png b/OsmAnd/res/drawable-mdpi/ic_action_user.png
deleted file mode 100644
index b54f56fbf0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_user.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_view.png b/OsmAnd/res/drawable-mdpi/ic_action_view.png
deleted file mode 100644
index 12ae65d881..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_view.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-mdpi/ic_action_volume_mute.png
deleted file mode 100755
index 035d4afe30..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_volume_mute.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_volume_up.png b/OsmAnd/res/drawable-mdpi/ic_action_volume_up.png
deleted file mode 100644
index 1395316d57..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_volume_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-mdpi/ic_action_waypoint.png
deleted file mode 100644
index 347585edcc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_weight_limit.png b/OsmAnd/res/drawable-mdpi/ic_action_weight_limit.png
deleted file mode 100755
index 6bb749c84d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_weight_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_widget_collapse.png b/OsmAnd/res/drawable-mdpi/ic_action_widget_collapse.png
deleted file mode 100644
index 0135289a90..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_widget_collapse.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_width_limit.png b/OsmAnd/res/drawable-mdpi/ic_action_width_limit.png
deleted file mode 100755
index a55525dc2b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_width_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_wifi_off.png b/OsmAnd/res/drawable-mdpi/ic_action_wifi_off.png
deleted file mode 100644
index 3a0331e19b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_wifi_off.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png
deleted file mode 100644
index d5a3ee1b4c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_world_globe.png b/OsmAnd/res/drawable-mdpi/ic_action_world_globe.png
deleted file mode 100644
index f95f11bd30..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_world_globe.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_arrow_back.png b/OsmAnd/res/drawable-mdpi/ic_arrow_back.png
deleted file mode 100644
index c14541d3d7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_arrow_back.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_arrow_forward.png b/OsmAnd/res/drawable-mdpi/ic_arrow_forward.png
deleted file mode 100644
index 550bf46f8c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_arrow_forward.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_arrow_right_16.png b/OsmAnd/res/drawable-mdpi/ic_arrow_right_16.png
deleted file mode 100644
index f518ede074..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_arrow_right_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_check_box_dark.png b/OsmAnd/res/drawable-mdpi/ic_check_box_dark.png
deleted file mode 100644
index c285a3364f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_check_box_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_check_box_light.png b/OsmAnd/res/drawable-mdpi/ic_check_box_light.png
deleted file mode 100644
index 6876c6b685..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_check_box_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_check_box_outline_dark.png b/OsmAnd/res/drawable-mdpi/ic_check_box_outline_dark.png
deleted file mode 100644
index 074de324dc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_check_box_outline_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_check_box_outline_light.png b/OsmAnd/res/drawable-mdpi/ic_check_box_outline_light.png
deleted file mode 100644
index a6c2b712d0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_check_box_outline_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_christmas_illustration.png b/OsmAnd/res/drawable-mdpi/ic_christmas_illustration.png
deleted file mode 100644
index 98d2c8c61a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_christmas_illustration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_crashlog.png b/OsmAnd/res/drawable-mdpi/ic_crashlog.png
deleted file mode 100644
index 9d3058acba..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_crashlog.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_direction_arrow.png b/OsmAnd/res/drawable-mdpi/ic_direction_arrow.png
deleted file mode 100644
index 0dd7c1772e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_direction_arrow.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_dot_position.png b/OsmAnd/res/drawable-mdpi/ic_dot_position.png
deleted file mode 100644
index b25f16f3ff..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_dot_position.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_empty_state_search.png b/OsmAnd/res/drawable-mdpi/ic_empty_state_search.png
deleted file mode 100644
index b8256de606..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_empty_state_search.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_extension_dark.png b/OsmAnd/res/drawable-mdpi/ic_extension_dark.png
deleted file mode 100644
index e63c289f52..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_extension_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_flat_list_dark.png b/OsmAnd/res/drawable-mdpi/ic_flat_list_dark.png
deleted file mode 100644
index 28055acaa9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_flat_list_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_gpx_track.png b/OsmAnd/res/drawable-mdpi/ic_gpx_track.png
deleted file mode 100644
index 4b6d539b12..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_gpx_track.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_groped_by_type.png b/OsmAnd/res/drawable-mdpi/ic_groped_by_type.png
deleted file mode 100644
index ba27a4d5f7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_groped_by_type.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_group.png b/OsmAnd/res/drawable-mdpi/ic_group.png
deleted file mode 100644
index a5c18f9c95..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_logo_mapillary.png b/OsmAnd/res/drawable-mdpi/ic_logo_mapillary.png
deleted file mode 100644
index f4383296a8..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_logo_mapillary.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_next.png b/OsmAnd/res/drawable-mdpi/ic_next.png
deleted file mode 100644
index 3862a8cd35..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_next.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_bug.png b/OsmAnd/res/drawable-mdpi/ic_notification_bug.png
new file mode 100644
index 0000000000..5e5643b6f3
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_bug.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_pause.png b/OsmAnd/res/drawable-mdpi/ic_notification_pause.png
new file mode 100644
index 0000000000..312977f375
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_pause.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_play.png b/OsmAnd/res/drawable-mdpi/ic_notification_play.png
new file mode 100644
index 0000000000..d8495cd4e3
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_play.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_rec_start.png b/OsmAnd/res/drawable-mdpi/ic_notification_rec_start.png
new file mode 100644
index 0000000000..cc967a4b5b
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_rec_start.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_rec_stop.png b/OsmAnd/res/drawable-mdpi/ic_notification_rec_stop.png
new file mode 100644
index 0000000000..1d8e04c9b1
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_rec_stop.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_remove.png b/OsmAnd/res/drawable-mdpi/ic_notification_remove.png
new file mode 100644
index 0000000000..677c55bbef
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_remove.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_save.png b/OsmAnd/res/drawable-mdpi/ic_notification_save.png
new file mode 100644
index 0000000000..105fff7874
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_save.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_start_navigation.png b/OsmAnd/res/drawable-mdpi/ic_notification_start_navigation.png
new file mode 100644
index 0000000000..28999cac73
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_notification_track.png b/OsmAnd/res/drawable-mdpi/ic_notification_track.png
new file mode 100644
index 0000000000..5c73b24d47
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_notification_track.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_overflow_menu_white.png b/OsmAnd/res/drawable-mdpi/ic_overflow_menu_white.png
deleted file mode 100644
index eb2b0d75d8..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_overflow_menu_white.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_pause.png b/OsmAnd/res/drawable-mdpi/ic_pause.png
deleted file mode 100644
index 026f38854c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_pause.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_person.png b/OsmAnd/res/drawable-mdpi/ic_person.png
deleted file mode 100644
index fb642b9a8f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_person.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_play_dark.png b/OsmAnd/res/drawable-mdpi/ic_play_dark.png
deleted file mode 100644
index c7f4bcd42d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_play_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_plugin_accessibility.png b/OsmAnd/res/drawable-mdpi/ic_plugin_accessibility.png
deleted file mode 100644
index 0a0c1e8f12..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_plugin_accessibility.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_plugin_developer.png b/OsmAnd/res/drawable-mdpi/ic_plugin_developer.png
deleted file mode 100644
index 53cab23e3b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_plugin_developer.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_plugin_nautical_map.png b/OsmAnd/res/drawable-mdpi/ic_plugin_nautical_map.png
deleted file mode 100644
index 128e3e866c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_plugin_nautical_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_plugin_wikipedia.png b/OsmAnd/res/drawable-mdpi/ic_plugin_wikipedia.png
deleted file mode 100644
index 19092a1584..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_plugin_wikipedia.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_prev.png b/OsmAnd/res/drawable-mdpi/ic_prev.png
deleted file mode 100644
index 5513b05aaf..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_prev.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_sdcard.png b/OsmAnd/res/drawable-mdpi/ic_sdcard.png
deleted file mode 100755
index bc62b7e2ea..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_sdcard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_sdcard_16.png b/OsmAnd/res/drawable-mdpi/ic_sdcard_16.png
deleted file mode 100644
index 3962ada988..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_sdcard_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_show_on_map.png b/OsmAnd/res/drawable-mdpi/ic_show_on_map.png
deleted file mode 100644
index 1501518bb4..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_show_on_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_small_distance.png b/OsmAnd/res/drawable-mdpi/ic_small_distance.png
deleted file mode 100644
index 069685596a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_small_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_small_group.png b/OsmAnd/res/drawable-mdpi/ic_small_group.png
deleted file mode 100644
index 0e35fadf79..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_small_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_small_point.png b/OsmAnd/res/drawable-mdpi/ic_small_point.png
deleted file mode 100644
index fe2baae843..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_small_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_small_time.png b/OsmAnd/res/drawable-mdpi/ic_small_time.png
deleted file mode 100644
index 871df46af8..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_small_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_small_turn_left.png b/OsmAnd/res/drawable-mdpi/ic_small_turn_left.png
deleted file mode 100644
index 55e5a86fa7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_small_turn_left.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_small_turn_right.png b/OsmAnd/res/drawable-mdpi/ic_small_turn_right.png
deleted file mode 100644
index 086e8cdc99..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_small_turn_right.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_small_warning.png b/OsmAnd/res/drawable-mdpi/ic_small_warning.png
deleted file mode 100644
index 37bc1b2fbb..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_small_warning.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_sort_waypoint_dark.png b/OsmAnd/res/drawable-mdpi/ic_sort_waypoint_dark.png
deleted file mode 100644
index eaa72df175..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_sort_waypoint_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_tree_list_dark.png b/OsmAnd/res/drawable-mdpi/ic_tree_list_dark.png
deleted file mode 100644
index 2229f1f961..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_tree_list_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_address.png b/OsmAnd/res/drawable-mdpi/ic_type_address.png
deleted file mode 100644
index 07931e4219..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_address.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_archive.png b/OsmAnd/res/drawable-mdpi/ic_type_archive.png
deleted file mode 100644
index 2771a297b4..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_archive.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_bug.png b/OsmAnd/res/drawable-mdpi/ic_type_bug.png
deleted file mode 100644
index cb17c576f7..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_bug.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_coordinates.png b/OsmAnd/res/drawable-mdpi/ic_type_coordinates.png
deleted file mode 100644
index c7ce24d7ac..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_coordinates.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_favorites.png b/OsmAnd/res/drawable-mdpi/ic_type_favorites.png
deleted file mode 100644
index 146bd5467b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_favorites.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_file.png b/OsmAnd/res/drawable-mdpi/ic_type_file.png
deleted file mode 100644
index 73b9303d9e..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_file.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_img.png b/OsmAnd/res/drawable-mdpi/ic_type_img.png
deleted file mode 100644
index 3c0e1be62c..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_img.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_info.png b/OsmAnd/res/drawable-mdpi/ic_type_info.png
deleted file mode 100644
index 9f9c761b9d..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_info.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_video.png b/OsmAnd/res/drawable-mdpi/ic_type_video.png
deleted file mode 100644
index d0113fc2aa..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_video.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_waypoint.png b/OsmAnd/res/drawable-mdpi/ic_type_waypoint.png
deleted file mode 100644
index b3bb9a133b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_type_waypoints_group.png b/OsmAnd/res/drawable-mdpi/ic_type_waypoints_group.png
deleted file mode 100644
index 0c76548a03..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_type_waypoints_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_warning.png b/OsmAnd/res/drawable-mdpi/ic_warning.png
deleted file mode 100644
index 385c0f68af..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_warning.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_world_globe_dark.png b/OsmAnd/res/drawable-mdpi/ic_world_globe_dark.png
deleted file mode 100644
index 15554f2444..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/ic_world_globe_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_destination.png b/OsmAnd/res/drawable-mdpi/list_destination.png
deleted file mode 100644
index 78d66d47cc..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_intermediate.png b/OsmAnd/res/drawable-mdpi/list_intermediate.png
deleted file mode 100644
index 46a9928eda..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_startpoint.png b/OsmAnd/res/drawable-mdpi/list_startpoint.png
deleted file mode 100644
index e253b29415..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_startpoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_warnings_pedestrian.png b/OsmAnd/res/drawable-mdpi/list_warnings_pedestrian.png
deleted file mode 100644
index 8edea7aa81..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_warnings_pedestrian.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_warnings_pedestrian_us.png b/OsmAnd/res/drawable-mdpi/list_warnings_pedestrian_us.png
deleted file mode 100644
index f830eb0227..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_warnings_pedestrian_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_warnings_railways.png b/OsmAnd/res/drawable-mdpi/list_warnings_railways.png
deleted file mode 100644
index 5cc4942ac4..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_warnings_railways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_warnings_railways_us.png b/OsmAnd/res/drawable-mdpi/list_warnings_railways_us.png
deleted file mode 100644
index 4fb475677f..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_warnings_railways_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_warnings_speed_camera.png b/OsmAnd/res/drawable-mdpi/list_warnings_speed_camera.png
deleted file mode 100755
index 2fa80bc98b..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_warnings_speed_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_warnings_traffic_calming.png b/OsmAnd/res/drawable-mdpi/list_warnings_traffic_calming.png
deleted file mode 100644
index 879c7b9f3a..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_warnings_traffic_calming.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_warnings_tunnel.png b/OsmAnd/res/drawable-mdpi/list_warnings_tunnel.png
deleted file mode 100644
index 2da91283d0..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_warnings_tunnel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-mdpi/list_warnings_tunnel_us.png b/OsmAnd/res/drawable-mdpi/list_warnings_tunnel_us.png
deleted file mode 100644
index f3977586c9..0000000000
Binary files a/OsmAnd/res/drawable-mdpi/list_warnings_tunnel_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_add_photos.png b/OsmAnd/res/drawable-xhdpi/ic_action_add_photos.png
deleted file mode 100644
index 06a1552b2c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_add_photos.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_additional_option.png b/OsmAnd/res/drawable-xhdpi/ic_action_additional_option.png
deleted file mode 100644
index c17f0a4662..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_additional_option.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_addpoint_above.png b/OsmAnd/res/drawable-xhdpi/ic_action_addpoint_above.png
deleted file mode 100644
index 25e019aa37..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_addpoint_above.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_addpoint_below.png b/OsmAnd/res/drawable-xhdpi/ic_action_addpoint_below.png
deleted file mode 100644
index 26c62074b0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_addpoint_below.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_alert.png b/OsmAnd/res/drawable-xhdpi/ic_action_alert.png
deleted file mode 100644
index c5b152f79e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_alert.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_allow_private_access.png b/OsmAnd/res/drawable-xhdpi/ic_action_allow_private_access.png
deleted file mode 100644
index 1996777306..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_allow_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_altitude.png b/OsmAnd/res/drawable-xhdpi/ic_action_altitude.png
deleted file mode 100644
index bd013ee05f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_altitude.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_ascent.png b/OsmAnd/res/drawable-xhdpi/ic_action_altitude_ascent.png
deleted file mode 100644
index e61b0cdc84..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_ascent.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_average.png b/OsmAnd/res/drawable-xhdpi/ic_action_altitude_average.png
deleted file mode 100644
index 2afc4d5c8a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_average.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_average_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_altitude_average_16.png
deleted file mode 100644
index 894b938a01..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_average_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_descent.png b/OsmAnd/res/drawable-xhdpi/ic_action_altitude_descent.png
deleted file mode 100644
index f388171a19..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_descent.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_descent_ascent_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_altitude_descent_ascent_16.png
deleted file mode 100644
index 8bfa93627f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_descent_ascent_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_range_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_altitude_range_16.png
deleted file mode 100644
index 85c234f07c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_altitude_range_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_angular_unit.png b/OsmAnd/res/drawable-xhdpi/ic_action_angular_unit.png
deleted file mode 100755
index ce0fc8c92e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_angular_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_app_configuration.png b/OsmAnd/res/drawable-xhdpi/ic_action_app_configuration.png
deleted file mode 100644
index 4d1a364a27..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_app_configuration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_appearance.png b/OsmAnd/res/drawable-xhdpi/ic_action_appearance.png
deleted file mode 100644
index 97be3464dd..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_appearance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_down.png b/OsmAnd/res/drawable-xhdpi/ic_action_arrow_down.png
deleted file mode 100644
index 8e9591a05b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_down.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_drop_down.png b/OsmAnd/res/drawable-xhdpi/ic_action_arrow_drop_down.png
deleted file mode 100644
index ee2889819a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_drop_down.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_drop_up.png b/OsmAnd/res/drawable-xhdpi/ic_action_arrow_drop_up.png
deleted file mode 100644
index 4b7ae0e688..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_drop_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_forward_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_arrow_forward_16.png
deleted file mode 100644
index 72d0891f22..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_forward_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_up.png b/OsmAnd/res/drawable-xhdpi/ic_action_arrow_up.png
deleted file mode 100644
index d647b988da..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_arrow_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_avoid_motorways.png b/OsmAnd/res/drawable-xhdpi/ic_action_avoid_motorways.png
deleted file mode 100644
index 7afa47fcdc..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_avoid_motorways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_backspace_fill.png b/OsmAnd/res/drawable-xhdpi/ic_action_backspace_fill.png
deleted file mode 100644
index bd12719c4f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_backspace_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_backspace_stroke.png b/OsmAnd/res/drawable-xhdpi/ic_action_backspace_stroke.png
deleted file mode 100644
index 1b9bc39793..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_backspace_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_battery.png b/OsmAnd/res/drawable-xhdpi/ic_action_battery.png
deleted file mode 100644
index c320f6aecd..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_battery.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_bearing.png b/OsmAnd/res/drawable-xhdpi/ic_action_bearing.png
deleted file mode 100644
index 520881ef13..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_bearing.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_bearing_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_bearing_16.png
deleted file mode 100644
index 084abde341..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_bearing_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_big_feedback.png b/OsmAnd/res/drawable-xhdpi/ic_action_big_feedback.png
deleted file mode 100644
index 7f17638489..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_big_feedback.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_big_poll.png b/OsmAnd/res/drawable-xhdpi/ic_action_big_poll.png
deleted file mode 100644
index 61315f3f0e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_big_poll.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_bitcoin.png b/OsmAnd/res/drawable-xhdpi/ic_action_bitcoin.png
deleted file mode 100644
index 1b366df9ba..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_bitcoin.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_building.png b/OsmAnd/res/drawable-xhdpi/ic_action_building.png
deleted file mode 100644
index 26e5697276..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_building.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_building_number.png b/OsmAnd/res/drawable-xhdpi/ic_action_building_number.png
deleted file mode 100644
index ec3c5fb1c2..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_building_number.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_call_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_call_dark.png
deleted file mode 100644
index 844c83f464..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_call_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_change_navigation_points.png b/OsmAnd/res/drawable-xhdpi/ic_action_change_navigation_points.png
deleted file mode 100644
index c11282b253..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_change_navigation_points.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_circle.png b/OsmAnd/res/drawable-xhdpi/ic_action_circle.png
deleted file mode 100644
index c893f182c9..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_circle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_clear_all.png b/OsmAnd/res/drawable-xhdpi/ic_action_clear_all.png
deleted file mode 100644
index 570326ee7e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_clear_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_clear_all_fields.png b/OsmAnd/res/drawable-xhdpi/ic_action_clear_all_fields.png
deleted file mode 100644
index 5892875e83..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_clear_all_fields.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_close_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_close_dark.png
deleted file mode 100644
index ef5a6e233f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_close_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_compass.png b/OsmAnd/res/drawable-xhdpi/ic_action_compass.png
deleted file mode 100644
index f5f287c99e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_contents.png b/OsmAnd/res/drawable-xhdpi/ic_action_contents.png
deleted file mode 100644
index 582fbe6b23..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_contents.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_cuisine.png b/OsmAnd/res/drawable-xhdpi/ic_action_cuisine.png
deleted file mode 100644
index a62bc2f558..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_cuisine.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_data.png b/OsmAnd/res/drawable-xhdpi/ic_action_data.png
deleted file mode 100644
index d905fbe312..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_data.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_description.png b/OsmAnd/res/drawable-xhdpi/ic_action_description.png
deleted file mode 100644
index c1993505f7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_description.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_deselect_all.png b/OsmAnd/res/drawable-xhdpi/ic_action_deselect_all.png
deleted file mode 100644
index 45546fddc1..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_deselect_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_camera.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_camera.png
deleted file mode 100644
index 148da0174d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_device_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_top.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_top.png
deleted file mode 100644
index ca3da4bc7e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_device_top.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar.png
deleted file mode 100644
index 1c5171c8a0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar_two.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar_two.png
deleted file mode 100644
index a15f8d3054..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_device_topbar_two.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_widget.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_widget.png
deleted file mode 100644
index d7990198c4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_device_widget.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_device_widget_two.png b/OsmAnd/res/drawable-xhdpi/ic_action_device_widget_two.png
deleted file mode 100644
index 4afc6c16dd..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_device_widget_two.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_direction_compass.png b/OsmAnd/res/drawable-xhdpi/ic_action_direction_compass.png
deleted file mode 100755
index 7c0482b2ac..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_direction_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_direction_movement.png b/OsmAnd/res/drawable-xhdpi/ic_action_direction_movement.png
deleted file mode 100755
index 224f4733cc..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_direction_movement.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_direction_north.png b/OsmAnd/res/drawable-xhdpi/ic_action_direction_north.png
deleted file mode 100755
index 1a7d0a1ee6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_direction_north.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_display_position_bottom.png b/OsmAnd/res/drawable-xhdpi/ic_action_display_position_bottom.png
deleted file mode 100644
index edae19ee20..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_display_position_bottom.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_display_position_center.png b/OsmAnd/res/drawable-xhdpi/ic_action_display_position_center.png
deleted file mode 100644
index 3e8dbb001b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_display_position_center.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_done.png b/OsmAnd/res/drawable-xhdpi/ic_action_done.png
deleted file mode 100644
index c507fbaf06..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_done.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_down_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_down_dark.png
deleted file mode 100644
index c0f12906f7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_down_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png
deleted file mode 100644
index 66ab8968fa..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_elevation.png b/OsmAnd/res/drawable-xhdpi/ic_action_elevation.png
deleted file mode 100644
index 0d095c40a3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_elevation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_explore.png b/OsmAnd/res/drawable-xhdpi/ic_action_explore.png
deleted file mode 100644
index e894bac62e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_explore.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_export.png b/OsmAnd/res/drawable-xhdpi/ic_action_export.png
deleted file mode 100644
index 333dcdc5a8..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_export.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fastest_route.png b/OsmAnd/res/drawable-xhdpi/ic_action_fastest_route.png
deleted file mode 100755
index b3713b9460..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_fastest_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_filter.png b/OsmAnd/res/drawable-xhdpi/ic_action_filter.png
deleted file mode 100644
index 0f98a5b6dd..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_filter.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_filter_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_filter_dark.png
deleted file mode 100644
index 3045669d4a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_folder.png b/OsmAnd/res/drawable-xhdpi/ic_action_folder.png
deleted file mode 100644
index 3858aa783f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_folder.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_folder_move.png b/OsmAnd/res/drawable-xhdpi/ic_action_folder_move.png
deleted file mode 100755
index 531668a56c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_folder_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_folder_stroke.png b/OsmAnd/res/drawable-xhdpi/ic_action_folder_stroke.png
deleted file mode 100644
index 36b88b029a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_folder_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_forbid_private_access.png b/OsmAnd/res/drawable-xhdpi/ic_action_forbid_private_access.png
deleted file mode 100644
index 88017d5efe..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_forbid_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fps.png b/OsmAnd/res/drawable-xhdpi/ic_action_fps.png
deleted file mode 100644
index d6276c7925..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_fps.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_fuel.png b/OsmAnd/res/drawable-xhdpi/ic_action_fuel.png
deleted file mode 100644
index c50722ba24..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_fuel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gabout_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gabout_dark.png
deleted file mode 100644
index c66a736022..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gabout_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gdirections_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gdirections_dark.png
deleted file mode 100644
index 734cce8e61..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gdirections_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_get_my_location.png b/OsmAnd/res/drawable-xhdpi/ic_action_get_my_location.png
deleted file mode 100644
index 5c47a7eb30..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_get_my_location.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gift.png b/OsmAnd/res/drawable-xhdpi/ic_action_gift.png
deleted file mode 100644
index 631024e07f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gift.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gnew_label_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gnew_label_dark.png
deleted file mode 100644
index e132969468..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gnew_label_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gps_info.png b/OsmAnd/res/drawable-xhdpi/ic_action_gps_info.png
deleted file mode 100644
index 29fa12fa61..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gps_info.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_bold.png b/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_bold.png
deleted file mode 100644
index 5abaedd8b6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_bold.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_medium.png b/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_medium.png
deleted file mode 100644
index 1b071785e4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_medium.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_thin.png b/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_thin.png
deleted file mode 100644
index bf9a3f95af..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gpx_width_thin.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gremove_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gremove_dark.png
deleted file mode 100644
index a0614c35ab..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gremove_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_group2.png b/OsmAnd/res/drawable-xhdpi/ic_action_group2.png
deleted file mode 100644
index a88270ba52..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_group2.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_group_name_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_group_name_16.png
deleted file mode 100644
index 1ae9dee400..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_group_name_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_group_select_all.png b/OsmAnd/res/drawable-xhdpi/ic_action_group_select_all.png
deleted file mode 100644
index 7a71f04ddf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_group_select_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_height_limit.png b/OsmAnd/res/drawable-xhdpi/ic_action_height_limit.png
deleted file mode 100755
index a1c9be5d10..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_height_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_help.png b/OsmAnd/res/drawable-xhdpi/ic_action_help.png
deleted file mode 100644
index 49c8a293a1..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_help.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_hide.png b/OsmAnd/res/drawable-xhdpi/ic_action_hide.png
deleted file mode 100644
index e4de3eba46..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_hide.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_hillshade_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_hillshade_dark.png
deleted file mode 100644
index ccac68a016..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_hillshade_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_history.png b/OsmAnd/res/drawable-xhdpi/ic_action_history.png
deleted file mode 100644
index 05e8b4d1ce..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_history.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_history2.png b/OsmAnd/res/drawable-xhdpi/ic_action_history2.png
deleted file mode 100644
index c8624dc870..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_history2.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_intermediate.png b/OsmAnd/res/drawable-xhdpi/ic_action_intermediate.png
deleted file mode 100644
index 11635e7774..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_intermediate_destination.png b/OsmAnd/res/drawable-xhdpi/ic_action_intermediate_destination.png
deleted file mode 100644
index f587499034..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_intermediate_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_intermediate_destination_time.png b/OsmAnd/res/drawable-xhdpi/ic_action_intermediate_destination_time.png
deleted file mode 100644
index c4277c3458..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_intermediate_destination_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_internet_access_fee.png b/OsmAnd/res/drawable-xhdpi/ic_action_internet_access_fee.png
deleted file mode 100644
index ce407f0cf9..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_internet_access_fee.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_intersection.png b/OsmAnd/res/drawable-xhdpi/ic_action_intersection.png
deleted file mode 100644
index b14b3a57d9..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_intersection.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_item_move.png b/OsmAnd/res/drawable-xhdpi/ic_action_item_move.png
deleted file mode 100644
index 7bc48814a7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_item_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_keyboard.png b/OsmAnd/res/drawable-xhdpi/ic_action_keyboard.png
deleted file mode 100644
index b9c53b6323..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_keyboard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_keyboard_hide.png b/OsmAnd/res/drawable-xhdpi/ic_action_keyboard_hide.png
deleted file mode 100644
index b25d3295ee..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_keyboard_hide.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_label.png b/OsmAnd/res/drawable-xhdpi/ic_action_label.png
deleted file mode 100644
index d95d59f624..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_label.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_lanes.png b/OsmAnd/res/drawable-xhdpi/ic_action_lanes.png
deleted file mode 100755
index 7e7ac99beb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_lanes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_list_bullet.png b/OsmAnd/res/drawable-xhdpi/ic_action_list_bullet.png
deleted file mode 100644
index 79ea39f036..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_list_bullet.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_list_header.png b/OsmAnd/res/drawable-xhdpi/ic_action_list_header.png
deleted file mode 100644
index 07880142cb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_list_header.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_list_sort.png b/OsmAnd/res/drawable-xhdpi/ic_action_list_sort.png
deleted file mode 100644
index 04d9764742..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_list_sort.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_location_color.png b/OsmAnd/res/drawable-xhdpi/ic_action_location_color.png
deleted file mode 100644
index 14524a2ba7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_location_color.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_location_color_lost.png b/OsmAnd/res/drawable-xhdpi/ic_action_location_color_lost.png
deleted file mode 100644
index 17087d65a4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_location_color_lost.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_location_off.png b/OsmAnd/res/drawable-xhdpi/ic_action_location_off.png
deleted file mode 100644
index 2a06fa2a02..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_location_off.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_location_sharing_app.png b/OsmAnd/res/drawable-xhdpi/ic_action_location_sharing_app.png
deleted file mode 100644
index 8f27651613..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_location_sharing_app.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_day.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_day.png
deleted file mode 100644
index 8489accb49..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_language.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_language.png
deleted file mode 100644
index 014104daf0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_language.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_light_sensor.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_light_sensor.png
deleted file mode 100644
index 9d1775951a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_light_sensor.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_magnifier.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_magnifier.png
deleted file mode 100644
index 327a998338..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_magnifier.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_night.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_night.png
deleted file mode 100644
index 0a678936d6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_routes.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_routes.png
deleted file mode 100644
index a713e98b19..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_routes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_sunset.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_sunset.png
deleted file mode 100755
index 0efb95d4c2..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_sunset.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_map_text_size.png b/OsmAnd/res/drawable-xhdpi/ic_action_map_text_size.png
deleted file mode 100644
index 6d7ff42906..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_map_text_size.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_mapillary.png b/OsmAnd/res/drawable-xhdpi/ic_action_mapillary.png
deleted file mode 100644
index f89a573f76..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_mapillary.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_marker_passed.png b/OsmAnd/res/drawable-xhdpi/ic_action_marker_passed.png
deleted file mode 100644
index 3d51929b91..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_marker_passed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_markers_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_markers_dark.png
deleted file mode 100644
index dafe38661d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_markers_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_markers_list.png b/OsmAnd/res/drawable-xhdpi/ic_action_markers_list.png
deleted file mode 100644
index 7ce42393a5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_markers_list.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_max_speed.png b/OsmAnd/res/drawable-xhdpi/ic_action_max_speed.png
deleted file mode 100644
index 1f6674a763..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_max_speed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_max_speed_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_max_speed_16.png
deleted file mode 100644
index a21ce70a5e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_max_speed_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_measure_point.png b/OsmAnd/res/drawable-xhdpi/ic_action_measure_point.png
deleted file mode 100644
index bb68acc5de..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_measure_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_message.png b/OsmAnd/res/drawable-xhdpi/ic_action_message.png
deleted file mode 100644
index 121e147b48..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_message.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_minimize.png b/OsmAnd/res/drawable-xhdpi/ic_action_minimize.png
deleted file mode 100644
index 66bf08b752..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_minimize.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_moon.png b/OsmAnd/res/drawable-xhdpi/ic_action_moon.png
deleted file mode 100755
index f013e7d7b9..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_moon.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_motorways.png b/OsmAnd/res/drawable-xhdpi/ic_action_motorways.png
deleted file mode 100644
index c431d5712d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_motorways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_move_point.png b/OsmAnd/res/drawable-xhdpi/ic_action_move_point.png
deleted file mode 100644
index a677f1e2c3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_move_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_multiselect.png b/OsmAnd/res/drawable-xhdpi/ic_action_multiselect.png
deleted file mode 100644
index 0956ef1759..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_multiselect.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_nautical_depth.png b/OsmAnd/res/drawable-xhdpi/ic_action_nautical_depth.png
deleted file mode 100644
index ece5b9af0e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_nautical_depth.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_next_field_fill.png b/OsmAnd/res/drawable-xhdpi/ic_action_next_field_fill.png
deleted file mode 100644
index bbd92b3a65..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_next_field_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_next_field_stroke.png b/OsmAnd/res/drawable-xhdpi/ic_action_next_field_stroke.png
deleted file mode 100644
index 2052606e5b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_next_field_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_next_turn.png b/OsmAnd/res/drawable-xhdpi/ic_action_next_turn.png
deleted file mode 100644
index 254f094e21..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_next_turn.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_no_route.png b/OsmAnd/res/drawable-xhdpi/ic_action_no_route.png
deleted file mode 100644
index 7bd0843917..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_no_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_note_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_note_dark.png
deleted file mode 100644
index e5222c7b35..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_note_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_opacity.png b/OsmAnd/res/drawable-xhdpi/ic_action_opacity.png
deleted file mode 100644
index 2444ed4aca..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_opacity.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_opening_hour_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_opening_hour_16.png
deleted file mode 100644
index 84170f81ec..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_opening_hour_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_osm_live.png b/OsmAnd/res/drawable-xhdpi/ic_action_osm_live.png
deleted file mode 100644
index 7eac3904dd..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_osm_live.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_osmand_logo.png b/OsmAnd/res/drawable-xhdpi/ic_action_osmand_logo.png
deleted file mode 100644
index f0815781bb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_osmand_logo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_payment_card.png b/OsmAnd/res/drawable-xhdpi/ic_action_payment_card.png
deleted file mode 100644
index 3e28087808..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_payment_card.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_phone.png b/OsmAnd/res/drawable-xhdpi/ic_action_phone.png
deleted file mode 100755
index f06cf11e2f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_phone.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_phone_device_orientation.png b/OsmAnd/res/drawable-xhdpi/ic_action_phone_device_orientation.png
deleted file mode 100755
index eecb5ade56..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_phone_device_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_phone_landscape_orientation.png b/OsmAnd/res/drawable-xhdpi/ic_action_phone_landscape_orientation.png
deleted file mode 100755
index d677c2bfc0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_phone_landscape_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_phone_portrait_orientation.png b/OsmAnd/res/drawable-xhdpi/ic_action_phone_portrait_orientation.png
deleted file mode 100755
index df76b6f685..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_phone_portrait_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_placeholder_city.png b/OsmAnd/res/drawable-xhdpi/ic_action_placeholder_city.png
deleted file mode 100644
index 4eef5e26c2..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_placeholder_city.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_play_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_play_dark.png
deleted file mode 100644
index 1502612eca..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_play_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_plus.png b/OsmAnd/res/drawable-xhdpi/ic_action_plus.png
deleted file mode 100644
index 5d00eaba7d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_plus.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_plus_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_plus_dark.png
deleted file mode 100644
index 59b8387353..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_plus_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_poi_brand.png b/OsmAnd/res/drawable-xhdpi/ic_action_poi_brand.png
deleted file mode 100644
index 713246a66c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_poi_brand.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_poi_name.png b/OsmAnd/res/drawable-xhdpi/ic_action_poi_name.png
deleted file mode 100644
index ec17dfe29b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_poi_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_point_add_destination.png b/OsmAnd/res/drawable-xhdpi/ic_action_point_add_destination.png
deleted file mode 100644
index 7088895bf8..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_point_add_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_point_destination.png b/OsmAnd/res/drawable-xhdpi/ic_action_point_destination.png
deleted file mode 100644
index 5b2fafbda4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_point_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_point_start.png b/OsmAnd/res/drawable-xhdpi/ic_action_point_start.png
deleted file mode 100644
index 3766d74858..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_point_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_postcode.png b/OsmAnd/res/drawable-xhdpi/ic_action_postcode.png
deleted file mode 100644
index 6596c75b66..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_postcode.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_price_tag.png b/OsmAnd/res/drawable-xhdpi/ic_action_price_tag.png
deleted file mode 100644
index f85061c684..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_price_tag.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_private_access.png b/OsmAnd/res/drawable-xhdpi/ic_action_private_access.png
deleted file mode 100755
index 65b0105150..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_proxy.png b/OsmAnd/res/drawable-xhdpi/ic_action_proxy.png
deleted file mode 100755
index 99d05534d7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_proxy.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_qrcode.png b/OsmAnd/res/drawable-xhdpi/ic_action_qrcode.png
deleted file mode 100644
index 17974ae8bd..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_qrcode.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_read_article.png b/OsmAnd/res/drawable-xhdpi/ic_action_read_article.png
deleted file mode 100644
index 7db4333c3b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_read_article.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_read_later.png b/OsmAnd/res/drawable-xhdpi/ic_action_read_later.png
deleted file mode 100644
index 27bfef9e62..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_read_later.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_read_later_fill.png b/OsmAnd/res/drawable-xhdpi/ic_action_read_later_fill.png
deleted file mode 100644
index 3a3ebeaf3b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_read_later_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_read_text.png b/OsmAnd/res/drawable-xhdpi/ic_action_read_text.png
deleted file mode 100644
index a13cd804d1..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_read_text.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_rec_start.png b/OsmAnd/res/drawable-xhdpi/ic_action_rec_start.png
deleted file mode 100644
index 9ce3fc5d3d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_rec_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_rec_stop.png b/OsmAnd/res/drawable-xhdpi/ic_action_rec_stop.png
deleted file mode 100644
index 6590363955..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_rec_stop.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_redo_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_redo_dark.png
deleted file mode 100644
index 160476f95f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_redo_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_refresh_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_refresh_dark.png
deleted file mode 100644
index 4abaf1fc69..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_refresh_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_relative_bearing.png b/OsmAnd/res/drawable-xhdpi/ic_action_relative_bearing.png
deleted file mode 100644
index b08d4274d9..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_relative_bearing.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_remove.png b/OsmAnd/res/drawable-xhdpi/ic_action_remove.png
deleted file mode 100644
index 4cc9a311a0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_remove.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_remove_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_remove_dark.png
deleted file mode 100644
index 7f2de6194e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_remove_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_remove_small.png b/OsmAnd/res/drawable-xhdpi/ic_action_remove_small.png
deleted file mode 100644
index fbbdb6e482..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_remove_small.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_reorder.png b/OsmAnd/res/drawable-xhdpi/ic_action_reorder.png
deleted file mode 100644
index 09931760cf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_reorder.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_reset_to_default_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_reset_to_default_dark.png
deleted file mode 100644
index 803d76bd1b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_reset_to_default_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png
deleted file mode 100644
index 562efb5790..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_road_works_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_direction_from_here.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_direction_from_here.png
deleted file mode 100644
index c820e00890..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_direction_from_here.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_distance.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_distance.png
deleted file mode 100644
index 46c011ed8b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_first_intermediate.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_first_intermediate.png
deleted file mode 100644
index 709bdba29d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_first_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_first_intermediate_point.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_first_intermediate_point.png
deleted file mode 100644
index e0f4e8dbab..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_first_intermediate_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_last_intermediate.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_last_intermediate.png
deleted file mode 100644
index 044d52a528..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_last_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_last_intermediate_point.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_last_intermediate_point.png
deleted file mode 100644
index 9a35cc7d0c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_last_intermediate_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_points.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_points.png
deleted file mode 100644
index 10ceb698f7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_points.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_subsequent_destination.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_subsequent_destination.png
deleted file mode 100644
index cbd3df5ca6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_subsequent_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_route_subsequent_destination_point.png b/OsmAnd/res/drawable-xhdpi/ic_action_route_subsequent_destination_point.png
deleted file mode 100644
index d5936b220d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_route_subsequent_destination_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_ruler_circle.png b/OsmAnd/res/drawable-xhdpi/ic_action_ruler_circle.png
deleted file mode 100644
index c79737a83e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_ruler_circle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_ruler_unit.png b/OsmAnd/res/drawable-xhdpi/ic_action_ruler_unit.png
deleted file mode 100755
index f719f6b7ce..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_ruler_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sadface.png b/OsmAnd/res/drawable-xhdpi/ic_action_sadface.png
deleted file mode 100644
index 21fd975aa7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sadface.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sand_clock.png b/OsmAnd/res/drawable-xhdpi/ic_action_sand_clock.png
deleted file mode 100644
index e92ee34e30..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sand_clock.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_save.png b/OsmAnd/res/drawable-xhdpi/ic_action_save.png
deleted file mode 100644
index f0ac12c899..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_save.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_save_to_file.png b/OsmAnd/res/drawable-xhdpi/ic_action_save_to_file.png
deleted file mode 100644
index bb2757b774..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_save_to_file.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_search_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_search_dark.png
deleted file mode 100644
index 21e854525d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_search_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_select_all.png b/OsmAnd/res/drawable-xhdpi/ic_action_select_all.png
deleted file mode 100644
index 3fb55d95c6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_select_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sensor_interaction.png b/OsmAnd/res/drawable-xhdpi/ic_action_sensor_interaction.png
deleted file mode 100755
index ee67a4bddf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sensor_interaction.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_show_along_route.png b/OsmAnd/res/drawable-xhdpi/ic_action_show_along_route.png
deleted file mode 100644
index 4e021d54cc..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_show_along_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_show_keypad_left.png b/OsmAnd/res/drawable-xhdpi/ic_action_show_keypad_left.png
deleted file mode 100644
index af546cdc65..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_show_keypad_left.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_show_keypad_right.png b/OsmAnd/res/drawable-xhdpi/ic_action_show_keypad_right.png
deleted file mode 100644
index e953ecb6e6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_show_keypad_right.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_singleselect.png b/OsmAnd/res/drawable-xhdpi/ic_action_singleselect.png
deleted file mode 100644
index d0d488746a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_singleselect.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_snap_to_road.png b/OsmAnd/res/drawable-xhdpi/ic_action_snap_to_road.png
deleted file mode 100644
index 2be3fd455d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_snap_to_road.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_social_facebook.png b/OsmAnd/res/drawable-xhdpi/ic_action_social_facebook.png
deleted file mode 100644
index 3265950e24..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_social_facebook.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_social_instagram.png b/OsmAnd/res/drawable-xhdpi/ic_action_social_instagram.png
deleted file mode 100644
index 9477de1851..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_social_instagram.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_social_reddit.png b/OsmAnd/res/drawable-xhdpi/ic_action_social_reddit.png
deleted file mode 100644
index 3f29f53500..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_social_reddit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_social_twitter.png b/OsmAnd/res/drawable-xhdpi/ic_action_social_twitter.png
deleted file mode 100644
index f10ae1b1f0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_social_twitter.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_social_vk.png b/OsmAnd/res/drawable-xhdpi/ic_action_social_vk.png
deleted file mode 100644
index fdd0a6e995..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_social_vk.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sort_by_date.png b/OsmAnd/res/drawable-xhdpi/ic_action_sort_by_date.png
deleted file mode 100644
index f2dab0900d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sort_by_date.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sort_by_name.png b/OsmAnd/res/drawable-xhdpi/ic_action_sort_by_name.png
deleted file mode 100644
index 7ec0ff99f3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sort_by_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sort_door_to_door.png b/OsmAnd/res/drawable-xhdpi/ic_action_sort_door_to_door.png
deleted file mode 100644
index 0d44ab584b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sort_door_to_door.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sort_reverse_order.png b/OsmAnd/res/drawable-xhdpi/ic_action_sort_reverse_order.png
deleted file mode 100644
index 071740d589..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sort_reverse_order.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_speed.png b/OsmAnd/res/drawable-xhdpi/ic_action_speed.png
deleted file mode 100644
index aa69a709a5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_speed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_speed_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_speed_16.png
deleted file mode 100644
index 439828fa7c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_speed_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_speed_limit.png b/OsmAnd/res/drawable-xhdpi/ic_action_speed_limit.png
deleted file mode 100644
index c18b77ada5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_speed_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_split_interval.png b/OsmAnd/res/drawable-xhdpi/ic_action_split_interval.png
deleted file mode 100644
index 0b2e728bd7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_split_interval.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png b/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png
deleted file mode 100644
index 9b74a47019..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_start_navigation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_street_name.png b/OsmAnd/res/drawable-xhdpi/ic_action_street_name.png
deleted file mode 100644
index 2ec7ba1aa8..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_street_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_subscription_osmand_live.png b/OsmAnd/res/drawable-xhdpi/ic_action_subscription_osmand_live.png
deleted file mode 100644
index 07cc2f8288..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_subscription_osmand_live.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_sun.png b/OsmAnd/res/drawable-xhdpi/ic_action_sun.png
deleted file mode 100755
index 4adf2c53c3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_sun.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_target.png b/OsmAnd/res/drawable-xhdpi/ic_action_target.png
deleted file mode 100644
index 98a6d01f80..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_target.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_test_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_test_light.png
deleted file mode 100644
index 3eda81dc6e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_test_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_text_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_text_dark.png
deleted file mode 100644
index 65858c7f69..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_text_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time.png b/OsmAnd/res/drawable-xhdpi/ic_action_time.png
deleted file mode 100644
index fb2fb48869..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_end.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_end.png
deleted file mode 100644
index f27767f744..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time_end.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_end_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_end_16.png
deleted file mode 100644
index 778fe855ba..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time_end_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_moving_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_moving_16.png
deleted file mode 100644
index 8688e6ea54..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time_moving_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_span.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_span.png
deleted file mode 100644
index 1e6a74c7f7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time_span.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_span_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_span_16.png
deleted file mode 100644
index b96a872787..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time_span_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_start.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_start.png
deleted file mode 100644
index 645af7b611..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_start_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_start_16.png
deleted file mode 100644
index 94db2e9119..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time_start_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_time_to_distance.png b/OsmAnd/res/drawable-xhdpi/ic_action_time_to_distance.png
deleted file mode 100644
index e829179a1d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_time_to_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_track_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_track_16.png
deleted file mode 100644
index 44b29cf6c4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_track_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_trip_round.png b/OsmAnd/res/drawable-xhdpi/ic_action_trip_round.png
deleted file mode 100644
index 25d9519c12..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_trip_round.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_turn_screen_on.png b/OsmAnd/res/drawable-xhdpi/ic_action_turn_screen_on.png
deleted file mode 100755
index edd269c269..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_turn_screen_on.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_type_add.png b/OsmAnd/res/drawable-xhdpi/ic_action_type_add.png
deleted file mode 100644
index fa7a551ff8..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_type_add.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_type_add_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_type_add_16.png
deleted file mode 100644
index 9713bfff68..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_type_add_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_type_apply.png b/OsmAnd/res/drawable-xhdpi/ic_action_type_apply.png
deleted file mode 100644
index 80ce54319e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_type_apply.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_type_delete.png b/OsmAnd/res/drawable-xhdpi/ic_action_type_delete.png
deleted file mode 100644
index 2c0f5a45db..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_type_delete.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_type_delete_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_type_delete_16.png
deleted file mode 100644
index 9cc3481cb0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_type_delete_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_type_edit.png b/OsmAnd/res/drawable-xhdpi/ic_action_type_edit.png
deleted file mode 100644
index 243c03e4cf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_type_edit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_type_edit_16.png b/OsmAnd/res/drawable-xhdpi/ic_action_type_edit_16.png
deleted file mode 100644
index f568e5b24f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_type_edit_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_undo.png b/OsmAnd/res/drawable-xhdpi/ic_action_undo.png
deleted file mode 100644
index 8dc4a41fb1..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_undo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_undo_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_undo_dark.png
deleted file mode 100644
index e9557bbc4b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_undo_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_unlimited_download.png b/OsmAnd/res/drawable-xhdpi/ic_action_unlimited_download.png
deleted file mode 100644
index ae38e9711d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_unlimited_download.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_up_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_up_dark.png
deleted file mode 100644
index 4f7d29a838..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_up_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_user.png b/OsmAnd/res/drawable-xhdpi/ic_action_user.png
deleted file mode 100644
index 00c7347701..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_user.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_view.png b/OsmAnd/res/drawable-xhdpi/ic_action_view.png
deleted file mode 100644
index 9f4493c585..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_view.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-xhdpi/ic_action_volume_mute.png
deleted file mode 100755
index b217145bb4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_volume_mute.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_volume_up.png b/OsmAnd/res/drawable-xhdpi/ic_action_volume_up.png
deleted file mode 100644
index a0b4af2891..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_volume_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-xhdpi/ic_action_waypoint.png
deleted file mode 100644
index abdfb218b5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_weight_limit.png b/OsmAnd/res/drawable-xhdpi/ic_action_weight_limit.png
deleted file mode 100755
index fe606b21a0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_weight_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_widget_collapse.png b/OsmAnd/res/drawable-xhdpi/ic_action_widget_collapse.png
deleted file mode 100644
index b59dd31faf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_widget_collapse.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_width_limit.png b/OsmAnd/res/drawable-xhdpi/ic_action_width_limit.png
deleted file mode 100755
index ccdd283c09..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_width_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_wifi_off.png b/OsmAnd/res/drawable-xhdpi/ic_action_wifi_off.png
deleted file mode 100644
index f0b7e64e7c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_wifi_off.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png
deleted file mode 100644
index 79fdc08156..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_world_globe.png b/OsmAnd/res/drawable-xhdpi/ic_action_world_globe.png
deleted file mode 100644
index 9e0e07fd74..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_world_globe.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_arrow_back.png b/OsmAnd/res/drawable-xhdpi/ic_arrow_back.png
deleted file mode 100644
index e212ab8f5c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_arrow_back.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_arrow_forward.png b/OsmAnd/res/drawable-xhdpi/ic_arrow_forward.png
deleted file mode 100644
index 58d46fe938..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_arrow_forward.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_arrow_right_16.png b/OsmAnd/res/drawable-xhdpi/ic_arrow_right_16.png
deleted file mode 100644
index 77b6be87f9..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_arrow_right_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_check_box_dark.png b/OsmAnd/res/drawable-xhdpi/ic_check_box_dark.png
deleted file mode 100644
index 07ceec0d48..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_check_box_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_check_box_light.png b/OsmAnd/res/drawable-xhdpi/ic_check_box_light.png
deleted file mode 100644
index 2e2c8d1e51..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_check_box_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_check_box_outline_dark.png b/OsmAnd/res/drawable-xhdpi/ic_check_box_outline_dark.png
deleted file mode 100644
index d3db407e06..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_check_box_outline_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_check_box_outline_light.png b/OsmAnd/res/drawable-xhdpi/ic_check_box_outline_light.png
deleted file mode 100644
index 7c32c69387..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_check_box_outline_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_christmas_illustration.png b/OsmAnd/res/drawable-xhdpi/ic_christmas_illustration.png
deleted file mode 100644
index a93f0afefd..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_christmas_illustration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_crashlog.png b/OsmAnd/res/drawable-xhdpi/ic_crashlog.png
deleted file mode 100644
index 37bb33c48f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_crashlog.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_direction_arrow.png b/OsmAnd/res/drawable-xhdpi/ic_direction_arrow.png
deleted file mode 100644
index fbab873b59..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_direction_arrow.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_dot_position.png b/OsmAnd/res/drawable-xhdpi/ic_dot_position.png
deleted file mode 100644
index 33d5ec7aa6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_dot_position.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_empty_state_search.png b/OsmAnd/res/drawable-xhdpi/ic_empty_state_search.png
deleted file mode 100644
index 7d06334d42..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_empty_state_search.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_extension_dark.png b/OsmAnd/res/drawable-xhdpi/ic_extension_dark.png
deleted file mode 100644
index 56e603733f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_extension_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_flat_list_dark.png b/OsmAnd/res/drawable-xhdpi/ic_flat_list_dark.png
deleted file mode 100644
index 0a3f807e16..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_flat_list_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_gpx_track.png b/OsmAnd/res/drawable-xhdpi/ic_gpx_track.png
deleted file mode 100644
index 8f5653b032..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_gpx_track.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_groped_by_type.png b/OsmAnd/res/drawable-xhdpi/ic_groped_by_type.png
deleted file mode 100644
index 316829aef0..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_groped_by_type.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_group.png b/OsmAnd/res/drawable-xhdpi/ic_group.png
deleted file mode 100644
index 4ea162c464..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_logo_mapillary.png b/OsmAnd/res/drawable-xhdpi/ic_logo_mapillary.png
deleted file mode 100644
index 1366a94e30..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_logo_mapillary.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_next.png b/OsmAnd/res/drawable-xhdpi/ic_next.png
deleted file mode 100644
index 9afecd275b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_next.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_bug.png b/OsmAnd/res/drawable-xhdpi/ic_notification_bug.png
new file mode 100644
index 0000000000..e018c7185c
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_bug.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_pause.png b/OsmAnd/res/drawable-xhdpi/ic_notification_pause.png
new file mode 100644
index 0000000000..db625a70db
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_pause.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_play.png b/OsmAnd/res/drawable-xhdpi/ic_notification_play.png
new file mode 100644
index 0000000000..2abc05a717
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_play.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_rec_start.png b/OsmAnd/res/drawable-xhdpi/ic_notification_rec_start.png
new file mode 100644
index 0000000000..3900d9bef9
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_rec_start.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_rec_stop.png b/OsmAnd/res/drawable-xhdpi/ic_notification_rec_stop.png
new file mode 100644
index 0000000000..bdd248430a
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_rec_stop.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_remove.png b/OsmAnd/res/drawable-xhdpi/ic_notification_remove.png
new file mode 100644
index 0000000000..9fe2795b25
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_remove.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_save.png b/OsmAnd/res/drawable-xhdpi/ic_notification_save.png
new file mode 100644
index 0000000000..806769eb4e
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_save.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_start_navigation.png b/OsmAnd/res/drawable-xhdpi/ic_notification_start_navigation.png
new file mode 100644
index 0000000000..7de196ffe7
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_notification_track.png b/OsmAnd/res/drawable-xhdpi/ic_notification_track.png
new file mode 100644
index 0000000000..3dc288ee15
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_notification_track.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_overflow_menu_white.png b/OsmAnd/res/drawable-xhdpi/ic_overflow_menu_white.png
deleted file mode 100644
index 67673adab6..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_overflow_menu_white.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_pause.png b/OsmAnd/res/drawable-xhdpi/ic_pause.png
deleted file mode 100644
index 14b6d17d4a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_pause.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_person.png b/OsmAnd/res/drawable-xhdpi/ic_person.png
deleted file mode 100644
index d02d0ba588..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_person.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_play_dark.png b/OsmAnd/res/drawable-xhdpi/ic_play_dark.png
deleted file mode 100644
index 518dac837d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_play_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_plugin_accessibility.png b/OsmAnd/res/drawable-xhdpi/ic_plugin_accessibility.png
deleted file mode 100644
index 58d67d5a4c..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_plugin_accessibility.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_plugin_developer.png b/OsmAnd/res/drawable-xhdpi/ic_plugin_developer.png
deleted file mode 100644
index baf3139c07..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_plugin_developer.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_plugin_nautical_map.png b/OsmAnd/res/drawable-xhdpi/ic_plugin_nautical_map.png
deleted file mode 100644
index 92b70fb9d5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_plugin_nautical_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_plugin_wikipedia.png b/OsmAnd/res/drawable-xhdpi/ic_plugin_wikipedia.png
deleted file mode 100644
index a0ff70291f..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_plugin_wikipedia.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_prev.png b/OsmAnd/res/drawable-xhdpi/ic_prev.png
deleted file mode 100644
index 815b155c57..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_prev.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_sdcard.png b/OsmAnd/res/drawable-xhdpi/ic_sdcard.png
deleted file mode 100755
index 0c4d0d3f21..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_sdcard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_sdcard_16.png b/OsmAnd/res/drawable-xhdpi/ic_sdcard_16.png
deleted file mode 100644
index c94318f851..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_sdcard_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_show_on_map.png b/OsmAnd/res/drawable-xhdpi/ic_show_on_map.png
deleted file mode 100644
index 6b6ab4f2dc..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_show_on_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_distance.png b/OsmAnd/res/drawable-xhdpi/ic_small_distance.png
deleted file mode 100644
index f83efa52c5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_group.png b/OsmAnd/res/drawable-xhdpi/ic_small_group.png
deleted file mode 100644
index a440f345c7..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_point.png b/OsmAnd/res/drawable-xhdpi/ic_small_point.png
deleted file mode 100644
index e3a6f6076e..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_time.png b/OsmAnd/res/drawable-xhdpi/ic_small_time.png
deleted file mode 100644
index 569ea8d41b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_turn_left.png b/OsmAnd/res/drawable-xhdpi/ic_small_turn_left.png
deleted file mode 100644
index d422ef6a7a..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_turn_left.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_turn_right.png b/OsmAnd/res/drawable-xhdpi/ic_small_turn_right.png
deleted file mode 100644
index 18b741574d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_turn_right.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_warning.png b/OsmAnd/res/drawable-xhdpi/ic_small_warning.png
deleted file mode 100644
index 31637b59ed..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_small_warning.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_dark.png b/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_dark.png
deleted file mode 100644
index d793c24da3..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_sort_waypoint_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_tree_list_dark.png b/OsmAnd/res/drawable-xhdpi/ic_tree_list_dark.png
deleted file mode 100644
index 8e2f8aecde..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_tree_list_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_address.png b/OsmAnd/res/drawable-xhdpi/ic_type_address.png
deleted file mode 100644
index ea10839f41..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_address.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_archive.png b/OsmAnd/res/drawable-xhdpi/ic_type_archive.png
deleted file mode 100644
index 400d85fb11..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_archive.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_bug.png b/OsmAnd/res/drawable-xhdpi/ic_type_bug.png
deleted file mode 100644
index 2ed9104084..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_bug.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_coordinates.png b/OsmAnd/res/drawable-xhdpi/ic_type_coordinates.png
deleted file mode 100644
index 5f13480fcf..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_coordinates.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_favorites.png b/OsmAnd/res/drawable-xhdpi/ic_type_favorites.png
deleted file mode 100644
index d8ea91cddb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_favorites.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_file.png b/OsmAnd/res/drawable-xhdpi/ic_type_file.png
deleted file mode 100644
index 4558e51eab..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_file.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_img.png b/OsmAnd/res/drawable-xhdpi/ic_type_img.png
deleted file mode 100644
index 2fbe8fb722..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_img.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_info.png b/OsmAnd/res/drawable-xhdpi/ic_type_info.png
deleted file mode 100644
index c0a597655d..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_info.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_video.png b/OsmAnd/res/drawable-xhdpi/ic_type_video.png
deleted file mode 100644
index c5114517c5..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_video.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_waypoint.png b/OsmAnd/res/drawable-xhdpi/ic_type_waypoint.png
deleted file mode 100644
index cdd1cf1125..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_waypoints_group.png b/OsmAnd/res/drawable-xhdpi/ic_type_waypoints_group.png
deleted file mode 100644
index bbad97af98..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_type_waypoints_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_warning.png b/OsmAnd/res/drawable-xhdpi/ic_warning.png
deleted file mode 100644
index 6eb7943cd1..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_warning.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_world_globe_dark.png b/OsmAnd/res/drawable-xhdpi/ic_world_globe_dark.png
deleted file mode 100644
index 0255f1b883..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/ic_world_globe_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_destination.png b/OsmAnd/res/drawable-xhdpi/list_destination.png
deleted file mode 100644
index 132554a9e4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_intermediate.png b/OsmAnd/res/drawable-xhdpi/list_intermediate.png
deleted file mode 100644
index 06ca59588b..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_startpoint.png b/OsmAnd/res/drawable-xhdpi/list_startpoint.png
deleted file mode 100644
index cdf9e2d0b4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_startpoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_warnings_pedestrian.png b/OsmAnd/res/drawable-xhdpi/list_warnings_pedestrian.png
deleted file mode 100644
index 937437b9a9..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_warnings_pedestrian.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_warnings_pedestrian_us.png b/OsmAnd/res/drawable-xhdpi/list_warnings_pedestrian_us.png
deleted file mode 100644
index cae513b7a2..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_warnings_pedestrian_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_warnings_railways.png b/OsmAnd/res/drawable-xhdpi/list_warnings_railways.png
deleted file mode 100644
index c5972abd12..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_warnings_railways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_warnings_railways_us.png b/OsmAnd/res/drawable-xhdpi/list_warnings_railways_us.png
deleted file mode 100644
index f651a5d397..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_warnings_railways_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_warnings_speed_camera.png b/OsmAnd/res/drawable-xhdpi/list_warnings_speed_camera.png
deleted file mode 100755
index ee02a1a095..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_warnings_speed_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_warnings_traffic_calming.png b/OsmAnd/res/drawable-xhdpi/list_warnings_traffic_calming.png
deleted file mode 100644
index 15987c88d4..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_warnings_traffic_calming.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_warnings_tunnel.png b/OsmAnd/res/drawable-xhdpi/list_warnings_tunnel.png
deleted file mode 100644
index e912550dbb..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_warnings_tunnel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xhdpi/list_warnings_tunnel_us.png b/OsmAnd/res/drawable-xhdpi/list_warnings_tunnel_us.png
deleted file mode 100644
index c1833eef11..0000000000
Binary files a/OsmAnd/res/drawable-xhdpi/list_warnings_tunnel_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_add_photos.png b/OsmAnd/res/drawable-xxhdpi/ic_action_add_photos.png
deleted file mode 100644
index d867c5e96a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_add_photos.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_additional_option.png b/OsmAnd/res/drawable-xxhdpi/ic_action_additional_option.png
deleted file mode 100644
index 9128eaf6f2..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_additional_option.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_addpoint_above.png b/OsmAnd/res/drawable-xxhdpi/ic_action_addpoint_above.png
deleted file mode 100644
index 222a7ef777..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_addpoint_above.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_addpoint_below.png b/OsmAnd/res/drawable-xxhdpi/ic_action_addpoint_below.png
deleted file mode 100644
index 0dae538d54..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_addpoint_below.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_alert.png b/OsmAnd/res/drawable-xxhdpi/ic_action_alert.png
deleted file mode 100644
index 255d12aafd..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_alert.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_allow_private_access.png b/OsmAnd/res/drawable-xxhdpi/ic_action_allow_private_access.png
deleted file mode 100644
index 908703d273..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_allow_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude.png b/OsmAnd/res/drawable-xxhdpi/ic_action_altitude.png
deleted file mode 100644
index 661605292b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_ascent.png b/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_ascent.png
deleted file mode 100644
index 79d70dc07f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_ascent.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_average.png b/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_average.png
deleted file mode 100644
index 7b67c20f31..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_average.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_average_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_average_16.png
deleted file mode 100644
index ba4762ae78..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_average_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_descent.png b/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_descent.png
deleted file mode 100644
index 210dbd3e68..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_descent.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_descent_ascent_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_descent_ascent_16.png
deleted file mode 100644
index 9794eaa461..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_descent_ascent_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_range_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_range_16.png
deleted file mode 100644
index f3f1295972..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_altitude_range_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_angular_unit.png b/OsmAnd/res/drawable-xxhdpi/ic_action_angular_unit.png
deleted file mode 100755
index 79a7b65e7d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_angular_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_app_configuration.png b/OsmAnd/res/drawable-xxhdpi/ic_action_app_configuration.png
deleted file mode 100644
index 7c0437a419..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_app_configuration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_appearance.png b/OsmAnd/res/drawable-xxhdpi/ic_action_appearance.png
deleted file mode 100644
index aa54033a35..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_appearance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_down.png b/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_down.png
deleted file mode 100644
index 572bd5331b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_down.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_drop_down.png b/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_drop_down.png
deleted file mode 100644
index a016a42435..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_drop_down.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_drop_up.png b/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_drop_up.png
deleted file mode 100644
index 14e9c0ed70..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_drop_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_forward_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_forward_16.png
deleted file mode 100644
index 45fa848bed..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_forward_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_up.png b/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_up.png
deleted file mode 100644
index 36beca0576..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_arrow_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_avoid_motorways.png b/OsmAnd/res/drawable-xxhdpi/ic_action_avoid_motorways.png
deleted file mode 100644
index 41e01d50dd..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_avoid_motorways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_backspace_fill.png b/OsmAnd/res/drawable-xxhdpi/ic_action_backspace_fill.png
deleted file mode 100644
index 411789059e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_backspace_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_backspace_stroke.png b/OsmAnd/res/drawable-xxhdpi/ic_action_backspace_stroke.png
deleted file mode 100644
index d6c504ad20..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_backspace_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_battery.png b/OsmAnd/res/drawable-xxhdpi/ic_action_battery.png
deleted file mode 100644
index a83f0d4f6b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_battery.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_bearing.png b/OsmAnd/res/drawable-xxhdpi/ic_action_bearing.png
deleted file mode 100644
index ad9ead2a45..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_bearing.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_bearing_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_bearing_16.png
deleted file mode 100644
index 76794c4522..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_bearing_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_big_feedback.png b/OsmAnd/res/drawable-xxhdpi/ic_action_big_feedback.png
deleted file mode 100644
index 2d81c277da..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_big_feedback.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_big_poll.png b/OsmAnd/res/drawable-xxhdpi/ic_action_big_poll.png
deleted file mode 100644
index 399163ece5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_big_poll.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_bitcoin.png b/OsmAnd/res/drawable-xxhdpi/ic_action_bitcoin.png
deleted file mode 100644
index 98bb17a265..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_bitcoin.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_building.png b/OsmAnd/res/drawable-xxhdpi/ic_action_building.png
deleted file mode 100644
index 948407b0d3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_building.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_building_number.png b/OsmAnd/res/drawable-xxhdpi/ic_action_building_number.png
deleted file mode 100644
index d1938fff29..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_building_number.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_call_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_call_dark.png
deleted file mode 100644
index 4c94df0393..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_call_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_change_navigation_points.png b/OsmAnd/res/drawable-xxhdpi/ic_action_change_navigation_points.png
deleted file mode 100644
index 486b210797..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_change_navigation_points.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_circle.png b/OsmAnd/res/drawable-xxhdpi/ic_action_circle.png
deleted file mode 100644
index d735c89563..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_circle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_clear_all.png b/OsmAnd/res/drawable-xxhdpi/ic_action_clear_all.png
deleted file mode 100644
index 728d364210..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_clear_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_clear_all_fields.png b/OsmAnd/res/drawable-xxhdpi/ic_action_clear_all_fields.png
deleted file mode 100644
index 3481a8a7b2..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_clear_all_fields.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_compass.png b/OsmAnd/res/drawable-xxhdpi/ic_action_compass.png
deleted file mode 100644
index 368ea1562e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_contents.png b/OsmAnd/res/drawable-xxhdpi/ic_action_contents.png
deleted file mode 100644
index 469945de25..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_contents.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_cuisine.png b/OsmAnd/res/drawable-xxhdpi/ic_action_cuisine.png
deleted file mode 100644
index 784343e18f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_cuisine.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_data.png b/OsmAnd/res/drawable-xxhdpi/ic_action_data.png
deleted file mode 100644
index dc0b8cc818..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_data.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_description.png b/OsmAnd/res/drawable-xxhdpi/ic_action_description.png
deleted file mode 100644
index 54e276a086..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_description.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_deselect_all.png b/OsmAnd/res/drawable-xxhdpi/ic_action_deselect_all.png
deleted file mode 100644
index 4b77d4bd42..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_deselect_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_camera.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_camera.png
deleted file mode 100644
index 91fd421354..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_device_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_top.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_top.png
deleted file mode 100644
index f33fd77973..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_device_top.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar.png
deleted file mode 100644
index 3559edc1d6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar_two.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar_two.png
deleted file mode 100644
index 3be8f835b5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_device_topbar_two.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget.png
deleted file mode 100644
index c21b7b24f1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget_two.png b/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget_two.png
deleted file mode 100644
index 725f6f6f5c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_device_widget_two.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_direction_compass.png b/OsmAnd/res/drawable-xxhdpi/ic_action_direction_compass.png
deleted file mode 100755
index af86c8131c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_direction_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_direction_movement.png b/OsmAnd/res/drawable-xxhdpi/ic_action_direction_movement.png
deleted file mode 100755
index 5303229310..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_direction_movement.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_direction_north.png b/OsmAnd/res/drawable-xxhdpi/ic_action_direction_north.png
deleted file mode 100755
index ceebb50238..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_direction_north.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_display_position_bottom.png b/OsmAnd/res/drawable-xxhdpi/ic_action_display_position_bottom.png
deleted file mode 100644
index c4d396049b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_display_position_bottom.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_display_position_center.png b/OsmAnd/res/drawable-xxhdpi/ic_action_display_position_center.png
deleted file mode 100644
index 29d23032be..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_display_position_center.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_done.png b/OsmAnd/res/drawable-xxhdpi/ic_action_done.png
deleted file mode 100644
index 575e04d807..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_done.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_down_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_down_dark.png
deleted file mode 100644
index 6ea48f2de1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_down_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png
deleted file mode 100644
index f13f0e3278..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_elevation.png b/OsmAnd/res/drawable-xxhdpi/ic_action_elevation.png
deleted file mode 100644
index 2214ab9476..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_elevation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_explore.png b/OsmAnd/res/drawable-xxhdpi/ic_action_explore.png
deleted file mode 100644
index 44390a272d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_explore.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_export.png b/OsmAnd/res/drawable-xxhdpi/ic_action_export.png
deleted file mode 100644
index f678ef0d4b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_export.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fastest_route.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fastest_route.png
deleted file mode 100755
index ce6c4abfbe..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_fastest_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_filter.png b/OsmAnd/res/drawable-xxhdpi/ic_action_filter.png
deleted file mode 100644
index b5025dcccc..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_filter.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_filter_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_filter_dark.png
deleted file mode 100644
index 4721d3c3cf..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_filter_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_folder.png b/OsmAnd/res/drawable-xxhdpi/ic_action_folder.png
deleted file mode 100644
index 0c6aee590f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_folder.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_folder_move.png b/OsmAnd/res/drawable-xxhdpi/ic_action_folder_move.png
deleted file mode 100755
index 91759b43eb..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_folder_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_folder_stroke.png b/OsmAnd/res/drawable-xxhdpi/ic_action_folder_stroke.png
deleted file mode 100644
index de47921be5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_folder_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_forbid_private_access.png b/OsmAnd/res/drawable-xxhdpi/ic_action_forbid_private_access.png
deleted file mode 100644
index d28c4f3910..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_forbid_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fps.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fps.png
deleted file mode 100644
index 3314ad131d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_fps.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_fuel.png b/OsmAnd/res/drawable-xxhdpi/ic_action_fuel.png
deleted file mode 100644
index ca1e394930..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_fuel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_dark.png
deleted file mode 100644
index d251ab86be..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gabout_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gdirections_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gdirections_dark.png
deleted file mode 100644
index 9897a755db..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gdirections_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_get_my_location.png b/OsmAnd/res/drawable-xxhdpi/ic_action_get_my_location.png
deleted file mode 100644
index 8b82220ab9..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_get_my_location.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gift.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gift.png
deleted file mode 100644
index f48375b837..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gift.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gnew_label_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gnew_label_dark.png
deleted file mode 100644
index 9bdaa64e41..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gnew_label_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gps_info.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gps_info.png
deleted file mode 100644
index ffc7e087bf..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gps_info.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_bold.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_bold.png
deleted file mode 100644
index 57d4ed5909..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_bold.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_medium.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_medium.png
deleted file mode 100644
index d97d0ab4b1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_medium.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_thin.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_thin.png
deleted file mode 100644
index 5eeb0e1c87..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_gpx_width_thin.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_group2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_group2.png
deleted file mode 100644
index 64ca3c1ae1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_group2.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_group_name_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_group_name_16.png
deleted file mode 100644
index 7c18560156..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_group_name_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_group_select_all.png b/OsmAnd/res/drawable-xxhdpi/ic_action_group_select_all.png
deleted file mode 100644
index 7b2fe26d26..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_group_select_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_height_limit.png b/OsmAnd/res/drawable-xxhdpi/ic_action_height_limit.png
deleted file mode 100755
index 34a111dbd9..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_height_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_help.png b/OsmAnd/res/drawable-xxhdpi/ic_action_help.png
deleted file mode 100644
index b7e487733e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_help.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_hide.png b/OsmAnd/res/drawable-xxhdpi/ic_action_hide.png
deleted file mode 100644
index 9fa6919d6e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_hide.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_hillshade_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_hillshade_dark.png
deleted file mode 100644
index 47ba9e112e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_hillshade_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_history.png b/OsmAnd/res/drawable-xxhdpi/ic_action_history.png
deleted file mode 100644
index 0dcfd41704..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_history.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png b/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png
deleted file mode 100644
index 4663f1f32e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_history2.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate.png b/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate.png
deleted file mode 100644
index 249b5aa13d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate_destination.png b/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate_destination.png
deleted file mode 100644
index acfa78130a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate_destination_time.png b/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate_destination_time.png
deleted file mode 100644
index d587296555..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_intermediate_destination_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_internet_access_fee.png b/OsmAnd/res/drawable-xxhdpi/ic_action_internet_access_fee.png
deleted file mode 100644
index 5c4dab7326..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_internet_access_fee.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_intersection.png b/OsmAnd/res/drawable-xxhdpi/ic_action_intersection.png
deleted file mode 100644
index 699a1c636e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_intersection.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_item_move.png b/OsmAnd/res/drawable-xxhdpi/ic_action_item_move.png
deleted file mode 100644
index da3f33b6b5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_item_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_keyboard.png b/OsmAnd/res/drawable-xxhdpi/ic_action_keyboard.png
deleted file mode 100644
index 3b753b57b6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_keyboard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_keyboard_hide.png b/OsmAnd/res/drawable-xxhdpi/ic_action_keyboard_hide.png
deleted file mode 100644
index 2cea14e010..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_keyboard_hide.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_label.png b/OsmAnd/res/drawable-xxhdpi/ic_action_label.png
deleted file mode 100644
index 77d2843382..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_label.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_lanes.png b/OsmAnd/res/drawable-xxhdpi/ic_action_lanes.png
deleted file mode 100755
index 5d3d03c490..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_lanes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_list_bullet.png b/OsmAnd/res/drawable-xxhdpi/ic_action_list_bullet.png
deleted file mode 100644
index 034b522bfb..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_list_bullet.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_list_header.png b/OsmAnd/res/drawable-xxhdpi/ic_action_list_header.png
deleted file mode 100644
index 89446cd3dd..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_list_header.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_list_sort.png b/OsmAnd/res/drawable-xxhdpi/ic_action_list_sort.png
deleted file mode 100644
index b33214a564..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_list_sort.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_location_color.png b/OsmAnd/res/drawable-xxhdpi/ic_action_location_color.png
deleted file mode 100644
index 312170532d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_location_color.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_location_color_lost.png b/OsmAnd/res/drawable-xxhdpi/ic_action_location_color_lost.png
deleted file mode 100644
index 842dd19a9b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_location_color_lost.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_location_off.png b/OsmAnd/res/drawable-xxhdpi/ic_action_location_off.png
deleted file mode 100644
index cc6cb9313e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_location_off.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_location_sharing_app.png b/OsmAnd/res/drawable-xxhdpi/ic_action_location_sharing_app.png
deleted file mode 100644
index 88c5e86827..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_location_sharing_app.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_map_day.png b/OsmAnd/res/drawable-xxhdpi/ic_action_map_day.png
deleted file mode 100644
index f1a1bf1736..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_map_day.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_map_language.png b/OsmAnd/res/drawable-xxhdpi/ic_action_map_language.png
deleted file mode 100644
index 4f1db80563..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_map_language.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_map_light_sensor.png b/OsmAnd/res/drawable-xxhdpi/ic_action_map_light_sensor.png
deleted file mode 100644
index c18293711a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_map_light_sensor.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_map_magnifier.png b/OsmAnd/res/drawable-xxhdpi/ic_action_map_magnifier.png
deleted file mode 100644
index 3e73f6e28d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_map_magnifier.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_map_night.png b/OsmAnd/res/drawable-xxhdpi/ic_action_map_night.png
deleted file mode 100644
index 4c539aebb6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_map_night.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_map_routes.png b/OsmAnd/res/drawable-xxhdpi/ic_action_map_routes.png
deleted file mode 100644
index 0b8041b0d3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_map_routes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_map_sunset.png b/OsmAnd/res/drawable-xxhdpi/ic_action_map_sunset.png
deleted file mode 100755
index e9abe8975b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_map_sunset.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_map_text_size.png b/OsmAnd/res/drawable-xxhdpi/ic_action_map_text_size.png
deleted file mode 100644
index 5237f7d066..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_map_text_size.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_mapillary.png b/OsmAnd/res/drawable-xxhdpi/ic_action_mapillary.png
deleted file mode 100644
index 89fe0251d5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_mapillary.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_marker_passed.png b/OsmAnd/res/drawable-xxhdpi/ic_action_marker_passed.png
deleted file mode 100644
index c3ad4b574c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_marker_passed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_markers_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_markers_dark.png
deleted file mode 100644
index d27176eeb9..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_markers_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_markers_list.png b/OsmAnd/res/drawable-xxhdpi/ic_action_markers_list.png
deleted file mode 100644
index 0d8e0a9445..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_markers_list.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_max_speed.png b/OsmAnd/res/drawable-xxhdpi/ic_action_max_speed.png
deleted file mode 100644
index 9cf367bd5b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_max_speed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_max_speed_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_max_speed_16.png
deleted file mode 100644
index 33d0a54786..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_max_speed_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_measure_point.png b/OsmAnd/res/drawable-xxhdpi/ic_action_measure_point.png
deleted file mode 100644
index 0ac3c29f16..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_measure_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_message.png b/OsmAnd/res/drawable-xxhdpi/ic_action_message.png
deleted file mode 100644
index 8b8f2ff9f3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_message.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_minimize.png b/OsmAnd/res/drawable-xxhdpi/ic_action_minimize.png
deleted file mode 100644
index 6a099c3036..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_minimize.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_moon.png b/OsmAnd/res/drawable-xxhdpi/ic_action_moon.png
deleted file mode 100755
index 3e4be9d3ef..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_moon.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_motorways.png b/OsmAnd/res/drawable-xxhdpi/ic_action_motorways.png
deleted file mode 100644
index 1d010a4f3b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_motorways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_move_point.png b/OsmAnd/res/drawable-xxhdpi/ic_action_move_point.png
deleted file mode 100644
index 45cc045d78..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_move_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_multiselect.png b/OsmAnd/res/drawable-xxhdpi/ic_action_multiselect.png
deleted file mode 100644
index 4f786040d4..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_multiselect.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_nautical_depth.png b/OsmAnd/res/drawable-xxhdpi/ic_action_nautical_depth.png
deleted file mode 100644
index 9ef52a6519..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_nautical_depth.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_next_field_fill.png b/OsmAnd/res/drawable-xxhdpi/ic_action_next_field_fill.png
deleted file mode 100644
index a1af107664..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_next_field_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_next_field_stroke.png b/OsmAnd/res/drawable-xxhdpi/ic_action_next_field_stroke.png
deleted file mode 100644
index cff5c6fa44..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_next_field_stroke.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_next_turn.png b/OsmAnd/res/drawable-xxhdpi/ic_action_next_turn.png
deleted file mode 100644
index 830a570396..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_next_turn.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_no_route.png b/OsmAnd/res/drawable-xxhdpi/ic_action_no_route.png
deleted file mode 100644
index b0517ed7c9..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_no_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_note_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_note_dark.png
deleted file mode 100644
index b864dd09b6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_note_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_opacity.png b/OsmAnd/res/drawable-xxhdpi/ic_action_opacity.png
deleted file mode 100644
index 825ef8ddcd..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_opacity.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_opening_hour_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_opening_hour_16.png
deleted file mode 100644
index c291df9f7f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_opening_hour_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_osm_live.png b/OsmAnd/res/drawable-xxhdpi/ic_action_osm_live.png
deleted file mode 100644
index 5153d4346b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_osm_live.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_osmand_logo.png b/OsmAnd/res/drawable-xxhdpi/ic_action_osmand_logo.png
deleted file mode 100644
index 3e74a00b8e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_osmand_logo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_payment_card.png b/OsmAnd/res/drawable-xxhdpi/ic_action_payment_card.png
deleted file mode 100644
index 238536cf3d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_payment_card.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_phone.png b/OsmAnd/res/drawable-xxhdpi/ic_action_phone.png
deleted file mode 100755
index 0e65abfc17..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_phone.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_phone_device_orientation.png b/OsmAnd/res/drawable-xxhdpi/ic_action_phone_device_orientation.png
deleted file mode 100755
index ea9275f5b6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_phone_device_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_phone_landscape_orientation.png b/OsmAnd/res/drawable-xxhdpi/ic_action_phone_landscape_orientation.png
deleted file mode 100755
index f9a5643bad..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_phone_landscape_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_phone_portrait_orientation.png b/OsmAnd/res/drawable-xxhdpi/ic_action_phone_portrait_orientation.png
deleted file mode 100755
index f413c91ab6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_phone_portrait_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_placeholder_city.png b/OsmAnd/res/drawable-xxhdpi/ic_action_placeholder_city.png
deleted file mode 100644
index 0b2eed5734..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_placeholder_city.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_play_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_play_dark.png
deleted file mode 100644
index c5c1147cc6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_play_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_plus.png b/OsmAnd/res/drawable-xxhdpi/ic_action_plus.png
deleted file mode 100644
index 8af94f5ee5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_plus.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_plus_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_plus_dark.png
deleted file mode 100644
index 853d15fa12..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_plus_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_poi_brand.png b/OsmAnd/res/drawable-xxhdpi/ic_action_poi_brand.png
deleted file mode 100644
index 35c0e0a3da..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_poi_brand.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_poi_name.png b/OsmAnd/res/drawable-xxhdpi/ic_action_poi_name.png
deleted file mode 100644
index 356f0f170e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_poi_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_point_add_destination.png b/OsmAnd/res/drawable-xxhdpi/ic_action_point_add_destination.png
deleted file mode 100644
index 228662fc46..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_point_add_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_point_destination.png b/OsmAnd/res/drawable-xxhdpi/ic_action_point_destination.png
deleted file mode 100644
index 7bd95d3582..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_point_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_point_start.png b/OsmAnd/res/drawable-xxhdpi/ic_action_point_start.png
deleted file mode 100644
index 8a03b9989c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_point_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_postcode.png b/OsmAnd/res/drawable-xxhdpi/ic_action_postcode.png
deleted file mode 100644
index ed939bb072..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_postcode.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_price_tag.png b/OsmAnd/res/drawable-xxhdpi/ic_action_price_tag.png
deleted file mode 100644
index f753fa49fa..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_price_tag.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_private_access.png b/OsmAnd/res/drawable-xxhdpi/ic_action_private_access.png
deleted file mode 100755
index 0afbfd8fdc..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_proxy.png b/OsmAnd/res/drawable-xxhdpi/ic_action_proxy.png
deleted file mode 100755
index b4177ce7b1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_proxy.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_qrcode.png b/OsmAnd/res/drawable-xxhdpi/ic_action_qrcode.png
deleted file mode 100644
index d4920fad97..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_qrcode.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_read_article.png b/OsmAnd/res/drawable-xxhdpi/ic_action_read_article.png
deleted file mode 100644
index d1b7126d60..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_read_article.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_read_later.png b/OsmAnd/res/drawable-xxhdpi/ic_action_read_later.png
deleted file mode 100644
index 59bdcd79ee..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_read_later.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_read_later_fill.png b/OsmAnd/res/drawable-xxhdpi/ic_action_read_later_fill.png
deleted file mode 100644
index db5871b7d0..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_read_later_fill.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_read_text.png b/OsmAnd/res/drawable-xxhdpi/ic_action_read_text.png
deleted file mode 100644
index 0f73182ba9..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_read_text.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_rec_start.png b/OsmAnd/res/drawable-xxhdpi/ic_action_rec_start.png
deleted file mode 100644
index 178daad052..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_rec_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_rec_stop.png b/OsmAnd/res/drawable-xxhdpi/ic_action_rec_stop.png
deleted file mode 100644
index c536100a95..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_rec_stop.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_redo_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_redo_dark.png
deleted file mode 100644
index c6c2113594..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_redo_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_refresh_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_refresh_dark.png
deleted file mode 100644
index 7ee729df1f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_refresh_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_relative_bearing.png b/OsmAnd/res/drawable-xxhdpi/ic_action_relative_bearing.png
deleted file mode 100644
index bacaee0984..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_relative_bearing.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_remove.png b/OsmAnd/res/drawable-xxhdpi/ic_action_remove.png
deleted file mode 100644
index 1ca00208ec..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_remove.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_remove_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_remove_dark.png
deleted file mode 100644
index ea01fe05e2..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_remove_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_remove_small.png b/OsmAnd/res/drawable-xxhdpi/ic_action_remove_small.png
deleted file mode 100644
index 2a1f9f03ae..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_remove_small.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_reorder.png b/OsmAnd/res/drawable-xxhdpi/ic_action_reorder.png
deleted file mode 100644
index cce6c9be88..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_reorder.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_reset_to_default_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_reset_to_default_dark.png
deleted file mode 100644
index b365c2ec53..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_reset_to_default_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png
deleted file mode 100644
index 892f6bf3df..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_road_works_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_direction_from_here.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_direction_from_here.png
deleted file mode 100644
index 1f4b4ce5af..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_direction_from_here.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_distance.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_distance.png
deleted file mode 100644
index a2b06e899f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_first_intermediate.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_first_intermediate.png
deleted file mode 100644
index feb13ee895..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_first_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_first_intermediate_point.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_first_intermediate_point.png
deleted file mode 100644
index e1b5851356..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_first_intermediate_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_last_intermediate.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_last_intermediate.png
deleted file mode 100644
index 380a5d8243..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_last_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_last_intermediate_point.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_last_intermediate_point.png
deleted file mode 100644
index bfde94ce03..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_last_intermediate_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_points.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_points.png
deleted file mode 100644
index 9785f055eb..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_points.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_subsequent_destination.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_subsequent_destination.png
deleted file mode 100644
index 3073cc1ca8..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_subsequent_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_route_subsequent_destination_point.png b/OsmAnd/res/drawable-xxhdpi/ic_action_route_subsequent_destination_point.png
deleted file mode 100644
index 5ed6079ab6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_route_subsequent_destination_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_ruler_circle.png b/OsmAnd/res/drawable-xxhdpi/ic_action_ruler_circle.png
deleted file mode 100644
index 2119685182..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_ruler_circle.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_ruler_unit.png b/OsmAnd/res/drawable-xxhdpi/ic_action_ruler_unit.png
deleted file mode 100755
index f7e4543506..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_ruler_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sadface.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sadface.png
deleted file mode 100644
index 40dbc2fc24..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_sadface.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sand_clock.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sand_clock.png
deleted file mode 100644
index afb35668ca..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_sand_clock.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_save.png b/OsmAnd/res/drawable-xxhdpi/ic_action_save.png
deleted file mode 100644
index d60e257593..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_save.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_save_to_file.png b/OsmAnd/res/drawable-xxhdpi/ic_action_save_to_file.png
deleted file mode 100644
index 5cfc8b1a94..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_save_to_file.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_search_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_search_dark.png
deleted file mode 100644
index ec76e4d72c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_search_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_select_all.png b/OsmAnd/res/drawable-xxhdpi/ic_action_select_all.png
deleted file mode 100644
index d02eac7f22..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_select_all.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sensor_interaction.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sensor_interaction.png
deleted file mode 100755
index 76a9d6128b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_sensor_interaction.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_show_along_route.png b/OsmAnd/res/drawable-xxhdpi/ic_action_show_along_route.png
deleted file mode 100644
index 3ab4c55809..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_show_along_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_show_keypad_left.png b/OsmAnd/res/drawable-xxhdpi/ic_action_show_keypad_left.png
deleted file mode 100644
index 0e478beeeb..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_show_keypad_left.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_show_keypad_right.png b/OsmAnd/res/drawable-xxhdpi/ic_action_show_keypad_right.png
deleted file mode 100644
index 1a52d33d7d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_show_keypad_right.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_singleselect.png b/OsmAnd/res/drawable-xxhdpi/ic_action_singleselect.png
deleted file mode 100644
index 7b88b40d06..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_singleselect.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_snap_to_road.png b/OsmAnd/res/drawable-xxhdpi/ic_action_snap_to_road.png
deleted file mode 100644
index 689307857b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_snap_to_road.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_social_facebook.png b/OsmAnd/res/drawable-xxhdpi/ic_action_social_facebook.png
deleted file mode 100644
index eee2907d9f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_social_facebook.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_social_instagram.png b/OsmAnd/res/drawable-xxhdpi/ic_action_social_instagram.png
deleted file mode 100644
index a6d380c7f5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_social_instagram.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_social_reddit.png b/OsmAnd/res/drawable-xxhdpi/ic_action_social_reddit.png
deleted file mode 100644
index fc6eac26d3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_social_reddit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_social_twitter.png b/OsmAnd/res/drawable-xxhdpi/ic_action_social_twitter.png
deleted file mode 100644
index 1675a58f7b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_social_twitter.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_social_vk.png b/OsmAnd/res/drawable-xxhdpi/ic_action_social_vk.png
deleted file mode 100644
index b09d53e5c6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_social_vk.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sort_by_date.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sort_by_date.png
deleted file mode 100644
index 9f1b60c210..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_sort_by_date.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sort_by_name.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sort_by_name.png
deleted file mode 100644
index 1073a975dd..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_sort_by_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sort_door_to_door.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sort_door_to_door.png
deleted file mode 100644
index ceb759260b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_sort_door_to_door.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sort_reverse_order.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sort_reverse_order.png
deleted file mode 100644
index a69685c1d9..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_sort_reverse_order.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_speed.png b/OsmAnd/res/drawable-xxhdpi/ic_action_speed.png
deleted file mode 100644
index 8231d72e64..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_speed.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_speed_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_speed_16.png
deleted file mode 100644
index 6c6671d2ac..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_speed_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_speed_limit.png b/OsmAnd/res/drawable-xxhdpi/ic_action_speed_limit.png
deleted file mode 100644
index 6c66944181..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_speed_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_split_interval.png b/OsmAnd/res/drawable-xxhdpi/ic_action_split_interval.png
deleted file mode 100644
index 36a2746ce1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_split_interval.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png b/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png
deleted file mode 100644
index cf8fd2ed24..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_start_navigation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_street_name.png b/OsmAnd/res/drawable-xxhdpi/ic_action_street_name.png
deleted file mode 100644
index 33c1acf5d4..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_street_name.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_subscription_osmand_live.png b/OsmAnd/res/drawable-xxhdpi/ic_action_subscription_osmand_live.png
deleted file mode 100644
index 58092db4f0..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_subscription_osmand_live.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_sun.png b/OsmAnd/res/drawable-xxhdpi/ic_action_sun.png
deleted file mode 100755
index 84213be39e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_sun.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_target.png b/OsmAnd/res/drawable-xxhdpi/ic_action_target.png
deleted file mode 100644
index 693b4bbfd7..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_target.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_test_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_test_light.png
deleted file mode 100644
index 25385157a3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_test_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_text_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_text_dark.png
deleted file mode 100644
index 17dced8164..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_text_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time.png
deleted file mode 100644
index 46925feaf4..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_end.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_end.png
deleted file mode 100644
index 292871ef9c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time_end.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_end_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_end_16.png
deleted file mode 100644
index 4f0c4eeda7..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time_end_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_moving_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_moving_16.png
deleted file mode 100644
index cdb92625bf..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time_moving_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_span.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_span.png
deleted file mode 100644
index 824a836447..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time_span.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_span_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_span_16.png
deleted file mode 100644
index bde52b337d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time_span_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_start.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_start.png
deleted file mode 100644
index 9455b2547e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time_start.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_start_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_start_16.png
deleted file mode 100644
index 06e797778e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time_start_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_time_to_distance.png b/OsmAnd/res/drawable-xxhdpi/ic_action_time_to_distance.png
deleted file mode 100644
index d2985f11e1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_time_to_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_track_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_track_16.png
deleted file mode 100644
index 62e745ead4..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_track_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_trip_round.png b/OsmAnd/res/drawable-xxhdpi/ic_action_trip_round.png
deleted file mode 100644
index 44faed630b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_trip_round.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_turn_screen_on.png b/OsmAnd/res/drawable-xxhdpi/ic_action_turn_screen_on.png
deleted file mode 100755
index f30f133197..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_turn_screen_on.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_type_add.png b/OsmAnd/res/drawable-xxhdpi/ic_action_type_add.png
deleted file mode 100644
index 2a02ff236a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_type_add.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_type_add_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_type_add_16.png
deleted file mode 100644
index aacd481d4f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_type_add_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_type_apply.png b/OsmAnd/res/drawable-xxhdpi/ic_action_type_apply.png
deleted file mode 100644
index 11de80d03b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_type_apply.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_type_delete.png b/OsmAnd/res/drawable-xxhdpi/ic_action_type_delete.png
deleted file mode 100644
index 5139deaa25..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_type_delete.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_type_delete_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_type_delete_16.png
deleted file mode 100644
index 4995ad3158..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_type_delete_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_type_edit.png b/OsmAnd/res/drawable-xxhdpi/ic_action_type_edit.png
deleted file mode 100644
index 8d41758a60..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_type_edit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_type_edit_16.png b/OsmAnd/res/drawable-xxhdpi/ic_action_type_edit_16.png
deleted file mode 100644
index f00b70c66e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_type_edit_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_undo.png b/OsmAnd/res/drawable-xxhdpi/ic_action_undo.png
deleted file mode 100644
index b57158b86d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_undo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_undo_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_undo_dark.png
deleted file mode 100644
index 2636f74008..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_undo_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_unlimited_download.png b/OsmAnd/res/drawable-xxhdpi/ic_action_unlimited_download.png
deleted file mode 100644
index cf83cd4f81..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_unlimited_download.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_up_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_up_dark.png
deleted file mode 100644
index ccc8eb9bea..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_up_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_user.png b/OsmAnd/res/drawable-xxhdpi/ic_action_user.png
deleted file mode 100644
index 4f6ab242ab..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_user.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_view.png b/OsmAnd/res/drawable-xxhdpi/ic_action_view.png
deleted file mode 100644
index 9db1626258..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_view.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_mute.png
deleted file mode 100755
index 287f32805d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_volume_mute.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_volume_up.png b/OsmAnd/res/drawable-xxhdpi/ic_action_volume_up.png
deleted file mode 100644
index fa8e34f850..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_volume_up.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-xxhdpi/ic_action_waypoint.png
deleted file mode 100644
index 05ddef158a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_weight_limit.png b/OsmAnd/res/drawable-xxhdpi/ic_action_weight_limit.png
deleted file mode 100755
index be830e78ba..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_weight_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_widget_collapse.png b/OsmAnd/res/drawable-xxhdpi/ic_action_widget_collapse.png
deleted file mode 100644
index acad5a0e00..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_widget_collapse.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_width_limit.png b/OsmAnd/res/drawable-xxhdpi/ic_action_width_limit.png
deleted file mode 100755
index ae27e1df86..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_width_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_wifi_off.png b/OsmAnd/res/drawable-xxhdpi/ic_action_wifi_off.png
deleted file mode 100644
index 99cd04efda..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_wifi_off.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png
deleted file mode 100644
index aba973d2d4..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_world_globe.png b/OsmAnd/res/drawable-xxhdpi/ic_action_world_globe.png
deleted file mode 100644
index 87e9df4288..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_action_world_globe.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_arrow_back.png b/OsmAnd/res/drawable-xxhdpi/ic_arrow_back.png
deleted file mode 100644
index 1766bbc0ef..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_arrow_back.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_arrow_forward.png b/OsmAnd/res/drawable-xxhdpi/ic_arrow_forward.png
deleted file mode 100644
index 232b4b1672..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_arrow_forward.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_arrow_right_16.png b/OsmAnd/res/drawable-xxhdpi/ic_arrow_right_16.png
deleted file mode 100644
index ec01d2ef33..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_arrow_right_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_check_box_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_check_box_dark.png
deleted file mode 100644
index 1621c8154f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_check_box_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_check_box_light.png b/OsmAnd/res/drawable-xxhdpi/ic_check_box_light.png
deleted file mode 100644
index 876d972db5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_check_box_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_check_box_outline_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_check_box_outline_dark.png
deleted file mode 100644
index 2000862a92..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_check_box_outline_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_check_box_outline_light.png b/OsmAnd/res/drawable-xxhdpi/ic_check_box_outline_light.png
deleted file mode 100644
index bd7e9495bb..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_check_box_outline_light.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_christmas_illustration.png b/OsmAnd/res/drawable-xxhdpi/ic_christmas_illustration.png
deleted file mode 100644
index 288c881ec5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_christmas_illustration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_crashlog.png b/OsmAnd/res/drawable-xxhdpi/ic_crashlog.png
deleted file mode 100644
index af13d24a27..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_crashlog.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_direction_arrow.png b/OsmAnd/res/drawable-xxhdpi/ic_direction_arrow.png
deleted file mode 100644
index bd17a41d7f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_direction_arrow.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_dot_position.png b/OsmAnd/res/drawable-xxhdpi/ic_dot_position.png
deleted file mode 100644
index fe8e76b5ba..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_dot_position.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_empty_state_search.png b/OsmAnd/res/drawable-xxhdpi/ic_empty_state_search.png
deleted file mode 100644
index fe4d7aefdc..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_empty_state_search.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_extension_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_extension_dark.png
deleted file mode 100644
index f38943e005..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_extension_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_flat_list_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_flat_list_dark.png
deleted file mode 100644
index bc748aa857..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_flat_list_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_gpx_track.png b/OsmAnd/res/drawable-xxhdpi/ic_gpx_track.png
deleted file mode 100644
index 0f446c05b6..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_gpx_track.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_groped_by_type.png b/OsmAnd/res/drawable-xxhdpi/ic_groped_by_type.png
deleted file mode 100644
index 1a8867bb24..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_groped_by_type.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_group.png b/OsmAnd/res/drawable-xxhdpi/ic_group.png
deleted file mode 100644
index 342b36bbbe..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_logo_mapillary.png b/OsmAnd/res/drawable-xxhdpi/ic_logo_mapillary.png
deleted file mode 100644
index 2ed0a0c2cd..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_logo_mapillary.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_next.png b/OsmAnd/res/drawable-xxhdpi/ic_next.png
deleted file mode 100644
index 90773bc457..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_next.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_bug.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_bug.png
new file mode 100644
index 0000000000..e5437a3b61
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_bug.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_pause.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_pause.png
new file mode 100644
index 0000000000..aaa8c7ae61
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_pause.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_play.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_play.png
new file mode 100644
index 0000000000..6377557d41
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_play.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_rec_start.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_rec_start.png
new file mode 100644
index 0000000000..ee8aa4686b
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_rec_start.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_rec_stop.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_rec_stop.png
new file mode 100644
index 0000000000..081b9e4e2b
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_rec_stop.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_remove.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_remove.png
new file mode 100644
index 0000000000..47b4502def
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_remove.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_save.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_save.png
new file mode 100644
index 0000000000..801bfde509
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_save.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_start_navigation.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_start_navigation.png
new file mode 100644
index 0000000000..6f11a0a8b0
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_notification_track.png b/OsmAnd/res/drawable-xxhdpi/ic_notification_track.png
new file mode 100644
index 0000000000..3e122568e6
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_notification_track.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_overflow_menu_white.png b/OsmAnd/res/drawable-xxhdpi/ic_overflow_menu_white.png
deleted file mode 100644
index 2dedaef71f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_overflow_menu_white.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_pause.png b/OsmAnd/res/drawable-xxhdpi/ic_pause.png
deleted file mode 100644
index 72dfa9fa6c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_pause.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_person.png b/OsmAnd/res/drawable-xxhdpi/ic_person.png
deleted file mode 100644
index 7239d88d7f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_person.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_play_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_play_dark.png
deleted file mode 100644
index aaaad57230..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_play_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_plugin_accessibility.png b/OsmAnd/res/drawable-xxhdpi/ic_plugin_accessibility.png
deleted file mode 100644
index 1d7cb9d124..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_plugin_accessibility.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_plugin_developer.png b/OsmAnd/res/drawable-xxhdpi/ic_plugin_developer.png
deleted file mode 100644
index 1da5dd568f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_plugin_developer.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_plugin_nautical_map.png b/OsmAnd/res/drawable-xxhdpi/ic_plugin_nautical_map.png
deleted file mode 100644
index d0eac32212..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_plugin_nautical_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_plugin_wikipedia.png b/OsmAnd/res/drawable-xxhdpi/ic_plugin_wikipedia.png
deleted file mode 100644
index 10b9f02b82..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_plugin_wikipedia.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_prev.png b/OsmAnd/res/drawable-xxhdpi/ic_prev.png
deleted file mode 100644
index 3c2977640d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_prev.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_sdcard.png b/OsmAnd/res/drawable-xxhdpi/ic_sdcard.png
deleted file mode 100755
index b12b73311d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_sdcard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_sdcard_16.png b/OsmAnd/res/drawable-xxhdpi/ic_sdcard_16.png
deleted file mode 100644
index 3314db26c1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_sdcard_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_show_on_map.png b/OsmAnd/res/drawable-xxhdpi/ic_show_on_map.png
deleted file mode 100644
index b8f75b3fda..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_show_on_map.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_distance.png b/OsmAnd/res/drawable-xxhdpi/ic_small_distance.png
deleted file mode 100644
index dfefffff19..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_distance.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_group.png b/OsmAnd/res/drawable-xxhdpi/ic_small_group.png
deleted file mode 100644
index 7c4b45d02e..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_point.png b/OsmAnd/res/drawable-xxhdpi/ic_small_point.png
deleted file mode 100644
index 5288e9239a..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_point.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_time.png b/OsmAnd/res/drawable-xxhdpi/ic_small_time.png
deleted file mode 100644
index feb74d1ae3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_time.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_turn_left.png b/OsmAnd/res/drawable-xxhdpi/ic_small_turn_left.png
deleted file mode 100644
index f5ae7f1572..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_turn_left.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_turn_right.png b/OsmAnd/res/drawable-xxhdpi/ic_small_turn_right.png
deleted file mode 100644
index 05240acafc..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_turn_right.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png b/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png
deleted file mode 100644
index eac498dafa..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_dark.png
deleted file mode 100644
index 9d18981042..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_sort_waypoint_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_tree_list_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_tree_list_dark.png
deleted file mode 100644
index 42aa7193c7..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_tree_list_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_address.png b/OsmAnd/res/drawable-xxhdpi/ic_type_address.png
deleted file mode 100644
index 9605fc52ea..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_address.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_archive.png b/OsmAnd/res/drawable-xxhdpi/ic_type_archive.png
deleted file mode 100644
index d93d6c4410..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_archive.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_bug.png b/OsmAnd/res/drawable-xxhdpi/ic_type_bug.png
deleted file mode 100644
index 844035fc30..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_bug.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_coordinates.png b/OsmAnd/res/drawable-xxhdpi/ic_type_coordinates.png
deleted file mode 100644
index 4dc92d6e8f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_coordinates.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_favorites.png b/OsmAnd/res/drawable-xxhdpi/ic_type_favorites.png
deleted file mode 100644
index f314dbde8b..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_favorites.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_file.png b/OsmAnd/res/drawable-xxhdpi/ic_type_file.png
deleted file mode 100644
index 196d40d6fb..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_file.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_img.png b/OsmAnd/res/drawable-xxhdpi/ic_type_img.png
deleted file mode 100644
index 63442d96ba..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_img.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_info.png b/OsmAnd/res/drawable-xxhdpi/ic_type_info.png
deleted file mode 100644
index 453545c7b1..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_info.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_video.png b/OsmAnd/res/drawable-xxhdpi/ic_type_video.png
deleted file mode 100644
index 53c2f3d82f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_video.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_waypoint.png b/OsmAnd/res/drawable-xxhdpi/ic_type_waypoint.png
deleted file mode 100644
index 8ae1a6481c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_waypoints_group.png b/OsmAnd/res/drawable-xxhdpi/ic_type_waypoints_group.png
deleted file mode 100644
index 1a13bfcc90..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_type_waypoints_group.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_warning.png b/OsmAnd/res/drawable-xxhdpi/ic_warning.png
deleted file mode 100644
index 3f401317ef..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_warning.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_world_globe_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_world_globe_dark.png
deleted file mode 100644
index 97d6b3b781..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/ic_world_globe_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_destination.png b/OsmAnd/res/drawable-xxhdpi/list_destination.png
deleted file mode 100644
index 6b1716b412..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_destination.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_intermediate.png b/OsmAnd/res/drawable-xxhdpi/list_intermediate.png
deleted file mode 100644
index cfcc8fb16c..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_intermediate.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_startpoint.png b/OsmAnd/res/drawable-xxhdpi/list_startpoint.png
deleted file mode 100644
index f8a5401be5..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_startpoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_warnings_pedestrian.png b/OsmAnd/res/drawable-xxhdpi/list_warnings_pedestrian.png
deleted file mode 100644
index 8906089a01..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_warnings_pedestrian.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_warnings_pedestrian_us.png b/OsmAnd/res/drawable-xxhdpi/list_warnings_pedestrian_us.png
deleted file mode 100644
index 007f8affc3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_warnings_pedestrian_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_warnings_railways.png b/OsmAnd/res/drawable-xxhdpi/list_warnings_railways.png
deleted file mode 100644
index 7f4d21a2a0..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_warnings_railways.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_warnings_railways_us.png b/OsmAnd/res/drawable-xxhdpi/list_warnings_railways_us.png
deleted file mode 100644
index 6f8813f04d..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_warnings_railways_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_warnings_speed_camera.png b/OsmAnd/res/drawable-xxhdpi/list_warnings_speed_camera.png
deleted file mode 100755
index abf4554a46..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_warnings_speed_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_warnings_traffic_calming.png b/OsmAnd/res/drawable-xxhdpi/list_warnings_traffic_calming.png
deleted file mode 100644
index 1a1ac0d85f..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_warnings_traffic_calming.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_warnings_tunnel.png b/OsmAnd/res/drawable-xxhdpi/list_warnings_tunnel.png
deleted file mode 100644
index 58ad1d03b3..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_warnings_tunnel.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxhdpi/list_warnings_tunnel_us.png b/OsmAnd/res/drawable-xxhdpi/list_warnings_tunnel_us.png
deleted file mode 100644
index 67e91a68ed..0000000000
Binary files a/OsmAnd/res/drawable-xxhdpi/list_warnings_tunnel_us.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_alert.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_alert.png
deleted file mode 100644
index ee0166afdc..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_alert.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_angular_unit.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_angular_unit.png
deleted file mode 100755
index 11b099a5c9..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_angular_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_app_configuration.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_app_configuration.png
deleted file mode 100644
index 57b49548b9..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_app_configuration.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_arrow_forward_16.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_arrow_forward_16.png
deleted file mode 100644
index b02d791daf..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_arrow_forward_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_bearing_16.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_bearing_16.png
deleted file mode 100644
index 4881f37603..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_bearing_16.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_compass.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_compass.png
deleted file mode 100755
index 84bdee6a8b..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_compass.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_movement.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_movement.png
deleted file mode 100755
index bbc13b1c48..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_movement.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_north.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_north.png
deleted file mode 100755
index b62af45a54..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_direction_north.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_display_position_bottom.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_display_position_bottom.png
deleted file mode 100644
index c16e924b7a..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_display_position_bottom.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_display_position_center.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_display_position_center.png
deleted file mode 100644
index 459525e0ae..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_display_position_center.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_fastest_route.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_fastest_route.png
deleted file mode 100755
index b369d63d0b..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_fastest_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_folder_move.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_folder_move.png
deleted file mode 100755
index bd0dee343b..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_folder_move.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_height_limit.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_height_limit.png
deleted file mode 100755
index 98fb6619fa..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_height_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_lanes.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_lanes.png
deleted file mode 100755
index 91f2303103..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_lanes.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_location_color_lost.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_location_color_lost.png
deleted file mode 100644
index 68dfd41887..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_location_color_lost.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_map_sunset.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_map_sunset.png
deleted file mode 100755
index e8eb8f134f..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_map_sunset.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_moon.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_moon.png
deleted file mode 100755
index 72f4f5bd20..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_moon.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_no_route.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_no_route.png
deleted file mode 100644
index a033e74a06..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_no_route.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_phone.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_phone.png
deleted file mode 100755
index 460779a8e7..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_phone.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_device_orientation.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_device_orientation.png
deleted file mode 100755
index ac5b348627..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_device_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_landscape_orientation.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_landscape_orientation.png
deleted file mode 100755
index 9f16d15841..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_landscape_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_portrait_orientation.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_portrait_orientation.png
deleted file mode 100755
index 9cbefecc8b..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_phone_portrait_orientation.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_price_tag.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_price_tag.png
deleted file mode 100644
index ce59337375..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_price_tag.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_private_access.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_private_access.png
deleted file mode 100755
index a6b441c70d..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_private_access.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_proxy.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_proxy.png
deleted file mode 100755
index 527b586b3d..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_proxy.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_remove.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_remove.png
deleted file mode 100644
index 5533047bd6..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_remove.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_road_works_dark.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_road_works_dark.png
deleted file mode 100644
index 57e4a06ee0..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_road_works_dark.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_ruler_unit.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_ruler_unit.png
deleted file mode 100755
index 2305e5f380..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_ruler_unit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_sensor_interaction.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_sensor_interaction.png
deleted file mode 100755
index 7949e0e22d..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_sensor_interaction.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_social_instagram.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_social_instagram.png
deleted file mode 100644
index b51e2a286f..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_social_instagram.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_social_reddit.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_social_reddit.png
deleted file mode 100644
index 5aad5fdf68..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_social_reddit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_sun.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_sun.png
deleted file mode 100755
index 05341aa30e..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_sun.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_turn_screen_on.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_turn_screen_on.png
deleted file mode 100755
index a9b2f0ea18..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_turn_screen_on.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_undo.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_undo.png
deleted file mode 100644
index 1b5c25f10a..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_undo.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_volume_mute.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_volume_mute.png
deleted file mode 100755
index e0afad19d6..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_volume_mute.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_waypoint.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_waypoint.png
deleted file mode 100644
index 944443b284..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_waypoint.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_weight_limit.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_weight_limit.png
deleted file mode 100755
index 31b1936d49..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_weight_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_width_limit.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_width_limit.png
deleted file mode 100755
index 7bd5635afd..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_action_width_limit.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_bug.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_bug.png
new file mode 100644
index 0000000000..a6c042579d
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_bug.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_pause.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_pause.png
new file mode 100644
index 0000000000..83b313128c
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_pause.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_play.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_play.png
new file mode 100644
index 0000000000..3cd5acda31
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_play.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_rec_start.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_rec_start.png
new file mode 100644
index 0000000000..09ee4ab3f4
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_rec_start.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_rec_stop.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_rec_stop.png
new file mode 100644
index 0000000000..7a0800a645
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_rec_stop.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_remove.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_remove.png
new file mode 100644
index 0000000000..a9786bf09d
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_remove.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_save.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_save.png
new file mode 100644
index 0000000000..420d64da77
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_save.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_start_navigation.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_start_navigation.png
new file mode 100644
index 0000000000..be96a28e8f
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_start_navigation.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_notification_track.png b/OsmAnd/res/drawable-xxxhdpi/ic_notification_track.png
new file mode 100644
index 0000000000..15d610a1b8
Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_notification_track.png differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_sdcard.png b/OsmAnd/res/drawable-xxxhdpi/ic_sdcard.png
deleted file mode 100755
index f989b6ae53..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/ic_sdcard.png and /dev/null differ
diff --git a/OsmAnd/res/drawable-xxxhdpi/list_warnings_speed_camera.png b/OsmAnd/res/drawable-xxxhdpi/list_warnings_speed_camera.png
deleted file mode 100755
index 9cbc472a69..0000000000
Binary files a/OsmAnd/res/drawable-xxxhdpi/list_warnings_speed_camera.png and /dev/null differ
diff --git a/OsmAnd/res/drawable/btn_bg_border_inactive.xml b/OsmAnd/res/drawable/btn_bg_border_inactive_dark.xml
similarity index 74%
rename from OsmAnd/res/drawable/btn_bg_border_inactive.xml
rename to OsmAnd/res/drawable/btn_bg_border_inactive_dark.xml
index dcf60ef7ed..c50d0597c2 100644
--- a/OsmAnd/res/drawable/btn_bg_border_inactive.xml
+++ b/OsmAnd/res/drawable/btn_bg_border_inactive_dark.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/btn_bg_border_inactive_light.xml b/OsmAnd/res/drawable/btn_bg_border_inactive_light.xml
new file mode 100644
index 0000000000..e1d67c7345
--- /dev/null
+++ b/OsmAnd/res/drawable/btn_bg_border_inactive_light.xml
@@ -0,0 +1,10 @@
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/extension_stub.xml b/OsmAnd/res/drawable/extension_stub.xml
deleted file mode 100644
index 00571fbcd3..0000000000
--- a/OsmAnd/res/drawable/extension_stub.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- -
-
-
-
-
-
- -
-
-
-
diff --git a/OsmAnd/res/drawable/ic_action_add_photos.xml b/OsmAnd/res/drawable/ic_action_add_photos.xml
new file mode 100644
index 0000000000..c3b21bfa43
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_add_photos.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_additional_option.xml b/OsmAnd/res/drawable/ic_action_additional_option.xml
new file mode 100644
index 0000000000..3c99285bba
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_additional_option.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_addpoint_above.xml b/OsmAnd/res/drawable/ic_action_addpoint_above.xml
new file mode 100644
index 0000000000..00097792e1
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_addpoint_above.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_addpoint_below.xml b/OsmAnd/res/drawable/ic_action_addpoint_below.xml
new file mode 100644
index 0000000000..754402be47
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_addpoint_below.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_alert.xml b/OsmAnd/res/drawable/ic_action_alert.xml
new file mode 100644
index 0000000000..06e8553b9b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_alert.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_allow_private_access.xml b/OsmAnd/res/drawable/ic_action_allow_private_access.xml
new file mode 100644
index 0000000000..c39de4edfb
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_allow_private_access.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_altitude.xml b/OsmAnd/res/drawable/ic_action_altitude.xml
new file mode 100644
index 0000000000..a804e02bd8
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_altitude.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_altitude_ascent.xml b/OsmAnd/res/drawable/ic_action_altitude_ascent.xml
new file mode 100644
index 0000000000..511f9266e9
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_altitude_ascent.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_altitude_average.xml b/OsmAnd/res/drawable/ic_action_altitude_average.xml
new file mode 100644
index 0000000000..baafff25cb
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_altitude_average.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_altitude_average_16.xml b/OsmAnd/res/drawable/ic_action_altitude_average_16.xml
new file mode 100644
index 0000000000..65b22068b3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_altitude_average_16.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_altitude_descent.xml b/OsmAnd/res/drawable/ic_action_altitude_descent.xml
new file mode 100644
index 0000000000..cefbf1ed3a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_altitude_descent.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_altitude_descent_ascent_16.xml b/OsmAnd/res/drawable/ic_action_altitude_descent_ascent_16.xml
new file mode 100644
index 0000000000..d84deec1ec
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_altitude_descent_ascent_16.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_altitude_range_16.xml b/OsmAnd/res/drawable/ic_action_altitude_range_16.xml
new file mode 100644
index 0000000000..ca61b9f7c8
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_altitude_range_16.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_angular_unit.xml b/OsmAnd/res/drawable/ic_action_angular_unit.xml
new file mode 100644
index 0000000000..36b4c26437
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_angular_unit.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_app_configuration.xml b/OsmAnd/res/drawable/ic_action_app_configuration.xml
new file mode 100644
index 0000000000..7dcc9dab4a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_app_configuration.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_appearance.xml b/OsmAnd/res/drawable/ic_action_appearance.xml
new file mode 100644
index 0000000000..0b12596031
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_appearance.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_arrow_down.xml b/OsmAnd/res/drawable/ic_action_arrow_down.xml
new file mode 100644
index 0000000000..e48fcdbf3a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_arrow_down.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_arrow_drop_down.xml b/OsmAnd/res/drawable/ic_action_arrow_drop_down.xml
new file mode 100644
index 0000000000..e27e148888
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_arrow_drop_down.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_arrow_drop_up.xml b/OsmAnd/res/drawable/ic_action_arrow_drop_up.xml
new file mode 100644
index 0000000000..885a43da69
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_arrow_drop_up.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_arrow_forward_16.xml b/OsmAnd/res/drawable/ic_action_arrow_forward_16.xml
new file mode 100644
index 0000000000..5fd69ae2b7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_arrow_forward_16.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_arrow_up.xml b/OsmAnd/res/drawable/ic_action_arrow_up.xml
new file mode 100644
index 0000000000..be47eb96f3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_arrow_up.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_avoid_motorways.xml b/OsmAnd/res/drawable/ic_action_avoid_motorways.xml
new file mode 100644
index 0000000000..78f7b3d816
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_avoid_motorways.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_backspace_fill.xml b/OsmAnd/res/drawable/ic_action_backspace_fill.xml
new file mode 100644
index 0000000000..920dfed8e0
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_backspace_fill.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_backspace_stroke.xml b/OsmAnd/res/drawable/ic_action_backspace_stroke.xml
new file mode 100644
index 0000000000..c1544bf62d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_backspace_stroke.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_battery.xml b/OsmAnd/res/drawable/ic_action_battery.xml
new file mode 100644
index 0000000000..a4f3744aee
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_battery.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_bearing.xml b/OsmAnd/res/drawable/ic_action_bearing.xml
new file mode 100644
index 0000000000..364b65b658
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_bearing.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_bearing_16.xml b/OsmAnd/res/drawable/ic_action_bearing_16.xml
new file mode 100644
index 0000000000..546e47a6a1
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_bearing_16.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_big_feedback.xml b/OsmAnd/res/drawable/ic_action_big_feedback.xml
new file mode 100644
index 0000000000..72bf31cd36
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_big_feedback.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_big_poll.xml b/OsmAnd/res/drawable/ic_action_big_poll.xml
new file mode 100644
index 0000000000..fc58a8bcbe
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_big_poll.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_bitcoin.xml b/OsmAnd/res/drawable/ic_action_bitcoin.xml
new file mode 100644
index 0000000000..a132acaf3f
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_bitcoin.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_building.xml b/OsmAnd/res/drawable/ic_action_building.xml
new file mode 100644
index 0000000000..a7cbbd20e3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_building.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_building2.xml b/OsmAnd/res/drawable/ic_action_building2.xml
new file mode 100644
index 0000000000..afb8cbb39d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_building2.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_building_number.xml b/OsmAnd/res/drawable/ic_action_building_number.xml
new file mode 100644
index 0000000000..977dfd9908
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_building_number.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_call_dark.xml b/OsmAnd/res/drawable/ic_action_call_dark.xml
new file mode 100644
index 0000000000..73775f0fe3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_call_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_change_navigation_points.xml b/OsmAnd/res/drawable/ic_action_change_navigation_points.xml
new file mode 100644
index 0000000000..4b5bf4a23e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_change_navigation_points.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_circle.xml b/OsmAnd/res/drawable/ic_action_circle.xml
new file mode 100644
index 0000000000..01443940db
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_circle.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_clear_all.xml b/OsmAnd/res/drawable/ic_action_clear_all.xml
new file mode 100644
index 0000000000..1823305145
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_clear_all.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_clear_all_fields.xml b/OsmAnd/res/drawable/ic_action_clear_all_fields.xml
new file mode 100644
index 0000000000..972d7c03d7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_clear_all_fields.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_close_dark.xml b/OsmAnd/res/drawable/ic_action_close_dark.xml
new file mode 100644
index 0000000000..30edfe6e67
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_close_dark.xml
@@ -0,0 +1,12 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_compass.xml b/OsmAnd/res/drawable/ic_action_compass.xml
new file mode 100644
index 0000000000..48f7ff9c05
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_compass.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_contents.xml b/OsmAnd/res/drawable/ic_action_contents.xml
new file mode 100644
index 0000000000..7eab6741da
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_contents.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_cuisine.xml b/OsmAnd/res/drawable/ic_action_cuisine.xml
new file mode 100644
index 0000000000..067dbb5ed0
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_cuisine.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_data.xml b/OsmAnd/res/drawable/ic_action_data.xml
new file mode 100644
index 0000000000..58fab5419e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_data.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_description.xml b/OsmAnd/res/drawable/ic_action_description.xml
new file mode 100644
index 0000000000..78c4b24340
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_description.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_deselect_all.xml b/OsmAnd/res/drawable/ic_action_deselect_all.xml
new file mode 100644
index 0000000000..e30b55dc5b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_deselect_all.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_device_camera.xml b/OsmAnd/res/drawable/ic_action_device_camera.xml
new file mode 100644
index 0000000000..b957d95617
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_device_camera.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_device_top.xml b/OsmAnd/res/drawable/ic_action_device_top.xml
new file mode 100644
index 0000000000..38f4d18c7d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_device_top.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_device_topbar.xml b/OsmAnd/res/drawable/ic_action_device_topbar.xml
new file mode 100644
index 0000000000..ec4e06ea78
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_device_topbar.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_device_topbar_two.xml b/OsmAnd/res/drawable/ic_action_device_topbar_two.xml
new file mode 100644
index 0000000000..1d4d942c1d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_device_topbar_two.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_device_widget.xml b/OsmAnd/res/drawable/ic_action_device_widget.xml
new file mode 100644
index 0000000000..2aec573aad
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_device_widget.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_device_widget_two.xml b/OsmAnd/res/drawable/ic_action_device_widget_two.xml
new file mode 100644
index 0000000000..ca97cc9042
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_device_widget_two.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_direction_compass.xml b/OsmAnd/res/drawable/ic_action_direction_compass.xml
new file mode 100644
index 0000000000..90bc1a104e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_direction_compass.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_direction_movement.xml b/OsmAnd/res/drawable/ic_action_direction_movement.xml
new file mode 100644
index 0000000000..9046356682
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_direction_movement.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_direction_north.xml b/OsmAnd/res/drawable/ic_action_direction_north.xml
new file mode 100644
index 0000000000..d5a9db8b31
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_direction_north.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_display_position_bottom.xml b/OsmAnd/res/drawable/ic_action_display_position_bottom.xml
new file mode 100644
index 0000000000..522eb6639e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_display_position_bottom.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_display_position_center.xml b/OsmAnd/res/drawable/ic_action_display_position_center.xml
new file mode 100644
index 0000000000..4c1202ad3b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_display_position_center.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_done.xml b/OsmAnd/res/drawable/ic_action_done.xml
new file mode 100644
index 0000000000..81bc4df4b8
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_done.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_down_dark.xml b/OsmAnd/res/drawable/ic_action_down_dark.xml
new file mode 100644
index 0000000000..9dc0182746
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_down_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_edit_dark.xml b/OsmAnd/res/drawable/ic_action_edit_dark.xml
new file mode 100644
index 0000000000..aed8d7120c
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_edit_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_elevation.xml b/OsmAnd/res/drawable/ic_action_elevation.xml
new file mode 100644
index 0000000000..8786e5e8f1
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_elevation.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_explore.xml b/OsmAnd/res/drawable/ic_action_explore.xml
new file mode 100644
index 0000000000..2588a7bea3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_explore.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_export.xml b/OsmAnd/res/drawable/ic_action_export.xml
new file mode 100644
index 0000000000..e8c2459a2d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_export.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_fastest_route.xml b/OsmAnd/res/drawable/ic_action_fastest_route.xml
new file mode 100644
index 0000000000..a2036f9ef7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_fastest_route.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_filter.xml b/OsmAnd/res/drawable/ic_action_filter.xml
new file mode 100644
index 0000000000..6cdbfdf27f
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_filter.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_filter_dark.xml b/OsmAnd/res/drawable/ic_action_filter_dark.xml
new file mode 100644
index 0000000000..72bbe738ef
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_filter_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_folder.xml b/OsmAnd/res/drawable/ic_action_folder.xml
new file mode 100644
index 0000000000..61b57c4933
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_folder.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_folder_move.xml b/OsmAnd/res/drawable/ic_action_folder_move.xml
new file mode 100644
index 0000000000..51360e3ac8
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_folder_move.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_folder_stroke.xml b/OsmAnd/res/drawable/ic_action_folder_stroke.xml
new file mode 100644
index 0000000000..36b4e1e912
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_folder_stroke.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_forbid_private_access.xml b/OsmAnd/res/drawable/ic_action_forbid_private_access.xml
new file mode 100644
index 0000000000..12bc9709e6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_forbid_private_access.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_fps.xml b/OsmAnd/res/drawable/ic_action_fps.xml
new file mode 100644
index 0000000000..1665fd4e28
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_fps.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_fuel.xml b/OsmAnd/res/drawable/ic_action_fuel.xml
new file mode 100644
index 0000000000..552c75d299
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_fuel.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_gdirections_dark.xml b/OsmAnd/res/drawable/ic_action_gdirections_dark.xml
new file mode 100644
index 0000000000..6cc734cbd6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_gdirections_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_get_my_location.xml b/OsmAnd/res/drawable/ic_action_get_my_location.xml
new file mode 100644
index 0000000000..293ab5708e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_get_my_location.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_gift.xml b/OsmAnd/res/drawable/ic_action_gift.xml
new file mode 100644
index 0000000000..bf564f2163
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_gift.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_gnew_label_dark.xml b/OsmAnd/res/drawable/ic_action_gnew_label_dark.xml
new file mode 100644
index 0000000000..3ef4b4c29b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_gnew_label_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_gps_info.xml b/OsmAnd/res/drawable/ic_action_gps_info.xml
new file mode 100644
index 0000000000..ff193cea8d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_gps_info.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_gpx_width_bold.xml b/OsmAnd/res/drawable/ic_action_gpx_width_bold.xml
new file mode 100644
index 0000000000..fae803098e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_gpx_width_bold.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_gpx_width_medium.xml b/OsmAnd/res/drawable/ic_action_gpx_width_medium.xml
new file mode 100644
index 0000000000..7876ae0ef9
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_gpx_width_medium.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_gpx_width_thin.xml b/OsmAnd/res/drawable/ic_action_gpx_width_thin.xml
new file mode 100644
index 0000000000..3e62fc5fac
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_gpx_width_thin.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_gremove_dark.xml b/OsmAnd/res/drawable/ic_action_gremove_dark.xml
new file mode 100644
index 0000000000..a5d08f77c5
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_gremove_dark.xml
@@ -0,0 +1,12 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_group2.xml b/OsmAnd/res/drawable/ic_action_group2.xml
new file mode 100644
index 0000000000..d6a24fd511
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_group2.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_group_name_16.xml b/OsmAnd/res/drawable/ic_action_group_name_16.xml
new file mode 100644
index 0000000000..06cbd20afb
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_group_name_16.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_group_select_all.xml b/OsmAnd/res/drawable/ic_action_group_select_all.xml
new file mode 100644
index 0000000000..0bfee0ff1c
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_group_select_all.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_height_limit.xml b/OsmAnd/res/drawable/ic_action_height_limit.xml
new file mode 100644
index 0000000000..f364b4e0ee
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_height_limit.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_help.xml b/OsmAnd/res/drawable/ic_action_help.xml
new file mode 100644
index 0000000000..7656c01cc6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_help.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_hide.xml b/OsmAnd/res/drawable/ic_action_hide.xml
new file mode 100644
index 0000000000..f30f59e285
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_hide.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_hillshade_dark.xml b/OsmAnd/res/drawable/ic_action_hillshade_dark.xml
new file mode 100644
index 0000000000..61d5d3f69c
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_hillshade_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_history.xml b/OsmAnd/res/drawable/ic_action_history.xml
new file mode 100644
index 0000000000..9f432ceffc
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_history.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_history2.xml b/OsmAnd/res/drawable/ic_action_history2.xml
new file mode 100644
index 0000000000..4fb91e6e1c
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_history2.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_import.xml b/OsmAnd/res/drawable/ic_action_import.xml
index 8bf929c6b3..25d1378f04 100644
--- a/OsmAnd/res/drawable/ic_action_import.xml
+++ b/OsmAnd/res/drawable/ic_action_import.xml
@@ -4,7 +4,9 @@
android:viewportWidth="24"
android:viewportHeight="24">
+ android:pathData="M10,3H14V11H17L12,17L7,11H10V3Z"
+ android:fillColor="#ffffff"/>
+
diff --git a/OsmAnd/res/drawable/ic_action_intermediate.xml b/OsmAnd/res/drawable/ic_action_intermediate.xml
new file mode 100644
index 0000000000..8e22bb2d2b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_intermediate.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_intermediate_destination.xml b/OsmAnd/res/drawable/ic_action_intermediate_destination.xml
new file mode 100644
index 0000000000..966977cb56
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_intermediate_destination.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_intermediate_destination_time.xml b/OsmAnd/res/drawable/ic_action_intermediate_destination_time.xml
new file mode 100644
index 0000000000..97fd6cd397
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_intermediate_destination_time.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_internet_access_fee.xml b/OsmAnd/res/drawable/ic_action_internet_access_fee.xml
new file mode 100644
index 0000000000..4527143dd4
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_internet_access_fee.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_intersection.xml b/OsmAnd/res/drawable/ic_action_intersection.xml
new file mode 100644
index 0000000000..967cb97230
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_intersection.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_item_move.xml b/OsmAnd/res/drawable/ic_action_item_move.xml
new file mode 100644
index 0000000000..d42d17ffad
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_item_move.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_keyboard.xml b/OsmAnd/res/drawable/ic_action_keyboard.xml
new file mode 100644
index 0000000000..a1949b3f42
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_keyboard.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_keyboard_hide.xml b/OsmAnd/res/drawable/ic_action_keyboard_hide.xml
new file mode 100644
index 0000000000..a514639ea6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_keyboard_hide.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_label.xml b/OsmAnd/res/drawable/ic_action_label.xml
new file mode 100644
index 0000000000..ddd341f798
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_label.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_lanes.xml b/OsmAnd/res/drawable/ic_action_lanes.xml
new file mode 100644
index 0000000000..d0bfefd4e8
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_lanes.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_list_bullet.xml b/OsmAnd/res/drawable/ic_action_list_bullet.xml
new file mode 100644
index 0000000000..d816bfa979
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_list_bullet.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_list_header.xml b/OsmAnd/res/drawable/ic_action_list_header.xml
new file mode 100644
index 0000000000..decea427be
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_list_header.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_list_sort.xml b/OsmAnd/res/drawable/ic_action_list_sort.xml
new file mode 100644
index 0000000000..53a0f2482d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_list_sort.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_location_color.xml b/OsmAnd/res/drawable/ic_action_location_color.xml
new file mode 100644
index 0000000000..77ff70a1f0
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_location_color.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_location_color_lost.xml b/OsmAnd/res/drawable/ic_action_location_color_lost.xml
new file mode 100644
index 0000000000..8578ed10fd
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_location_color_lost.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_location_off.xml b/OsmAnd/res/drawable/ic_action_location_off.xml
new file mode 100644
index 0000000000..7ef8a83302
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_location_off.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_location_sharing_app.xml b/OsmAnd/res/drawable/ic_action_location_sharing_app.xml
new file mode 100644
index 0000000000..2b880f882c
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_location_sharing_app.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_map_day.xml b/OsmAnd/res/drawable/ic_action_map_day.xml
new file mode 100644
index 0000000000..25c577efda
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_map_day.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_map_language.xml b/OsmAnd/res/drawable/ic_action_map_language.xml
new file mode 100644
index 0000000000..14c1a69b05
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_map_language.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_map_light_sensor.xml b/OsmAnd/res/drawable/ic_action_map_light_sensor.xml
new file mode 100644
index 0000000000..50c0e7913d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_map_light_sensor.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_map_magnifier.xml b/OsmAnd/res/drawable/ic_action_map_magnifier.xml
new file mode 100644
index 0000000000..660e7bf479
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_map_magnifier.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_map_night.xml b/OsmAnd/res/drawable/ic_action_map_night.xml
new file mode 100644
index 0000000000..0540b7e967
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_map_night.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_map_routes.xml b/OsmAnd/res/drawable/ic_action_map_routes.xml
new file mode 100644
index 0000000000..803e89468b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_map_routes.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_map_sunset.xml b/OsmAnd/res/drawable/ic_action_map_sunset.xml
new file mode 100644
index 0000000000..a0862ddb43
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_map_sunset.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_map_text_size.xml b/OsmAnd/res/drawable/ic_action_map_text_size.xml
new file mode 100644
index 0000000000..13efc19164
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_map_text_size.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_mapillary.xml b/OsmAnd/res/drawable/ic_action_mapillary.xml
new file mode 100644
index 0000000000..8d608d3d9e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_mapillary.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_marker_passed.xml b/OsmAnd/res/drawable/ic_action_marker_passed.xml
new file mode 100644
index 0000000000..6de61f0a97
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_marker_passed.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_markers_dark.xml b/OsmAnd/res/drawable/ic_action_markers_dark.xml
new file mode 100644
index 0000000000..c063e34337
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_markers_dark.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_markers_list.xml b/OsmAnd/res/drawable/ic_action_markers_list.xml
new file mode 100644
index 0000000000..c3ba319b8f
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_markers_list.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_max_speed.xml b/OsmAnd/res/drawable/ic_action_max_speed.xml
new file mode 100644
index 0000000000..02f065cf8a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_max_speed.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_max_speed_16.xml b/OsmAnd/res/drawable/ic_action_max_speed_16.xml
new file mode 100644
index 0000000000..ffedbd77cb
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_max_speed_16.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_measure_point.xml b/OsmAnd/res/drawable/ic_action_measure_point.xml
new file mode 100644
index 0000000000..8df643cad2
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_measure_point.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_message.xml b/OsmAnd/res/drawable/ic_action_message.xml
new file mode 100644
index 0000000000..6aa15da5d0
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_message.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_minimize.xml b/OsmAnd/res/drawable/ic_action_minimize.xml
new file mode 100644
index 0000000000..7e32f9f531
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_minimize.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_moon.xml b/OsmAnd/res/drawable/ic_action_moon.xml
new file mode 100644
index 0000000000..1280037f9e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_moon.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_motorways.xml b/OsmAnd/res/drawable/ic_action_motorways.xml
new file mode 100644
index 0000000000..8e175da767
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_motorways.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_move_point.xml b/OsmAnd/res/drawable/ic_action_move_point.xml
new file mode 100644
index 0000000000..2404a9de35
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_move_point.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_multiselect.xml b/OsmAnd/res/drawable/ic_action_multiselect.xml
new file mode 100644
index 0000000000..47a4bf00e7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_multiselect.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_nautical_depth.xml b/OsmAnd/res/drawable/ic_action_nautical_depth.xml
new file mode 100644
index 0000000000..2ec14e00c1
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_nautical_depth.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_next_field_fill.xml b/OsmAnd/res/drawable/ic_action_next_field_fill.xml
new file mode 100644
index 0000000000..5b354ab98a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_next_field_fill.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_next_field_stroke.xml b/OsmAnd/res/drawable/ic_action_next_field_stroke.xml
new file mode 100644
index 0000000000..f199f97d74
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_next_field_stroke.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_next_turn.xml b/OsmAnd/res/drawable/ic_action_next_turn.xml
new file mode 100644
index 0000000000..6bfd2c1beb
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_next_turn.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_no_route.xml b/OsmAnd/res/drawable/ic_action_no_route.xml
new file mode 100644
index 0000000000..b65ae681a8
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_no_route.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_note_dark.xml b/OsmAnd/res/drawable/ic_action_note_dark.xml
new file mode 100644
index 0000000000..9cd5255385
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_note_dark.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_opacity.xml b/OsmAnd/res/drawable/ic_action_opacity.xml
new file mode 100644
index 0000000000..bef35bad8b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_opacity.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_opening_hour_16.xml b/OsmAnd/res/drawable/ic_action_opening_hour_16.xml
new file mode 100644
index 0000000000..bcc21ee184
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_opening_hour_16.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_osm_live.xml b/OsmAnd/res/drawable/ic_action_osm_live.xml
new file mode 100644
index 0000000000..3c087a54fd
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_osm_live.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_osmand_logo.xml b/OsmAnd/res/drawable/ic_action_osmand_logo.xml
new file mode 100644
index 0000000000..959c205879
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_osmand_logo.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_payment_card.xml b/OsmAnd/res/drawable/ic_action_payment_card.xml
new file mode 100644
index 0000000000..7483144c86
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_payment_card.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_phone.xml b/OsmAnd/res/drawable/ic_action_phone.xml
new file mode 100644
index 0000000000..07933be32b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_phone.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_phone_device_orientation.xml b/OsmAnd/res/drawable/ic_action_phone_device_orientation.xml
new file mode 100644
index 0000000000..e4b3d7490e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_phone_device_orientation.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_phone_landscape_orientation.xml b/OsmAnd/res/drawable/ic_action_phone_landscape_orientation.xml
new file mode 100644
index 0000000000..5a66ed25ff
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_phone_landscape_orientation.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_phone_portrait_orientation.xml b/OsmAnd/res/drawable/ic_action_phone_portrait_orientation.xml
new file mode 100644
index 0000000000..57b14a957e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_phone_portrait_orientation.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_placeholder_city.xml b/OsmAnd/res/drawable/ic_action_placeholder_city.xml
new file mode 100644
index 0000000000..76af152849
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_placeholder_city.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_play_dark.xml b/OsmAnd/res/drawable/ic_action_play_dark.xml
new file mode 100644
index 0000000000..d725490d36
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_play_dark.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_plus.xml b/OsmAnd/res/drawable/ic_action_plus.xml
new file mode 100644
index 0000000000..0f0e6caecf
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_plus.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_plus_dark.xml b/OsmAnd/res/drawable/ic_action_plus_dark.xml
new file mode 100644
index 0000000000..b4197fd1da
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_plus_dark.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_poi_brand.xml b/OsmAnd/res/drawable/ic_action_poi_brand.xml
new file mode 100644
index 0000000000..13094fe807
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_poi_brand.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_poi_name.xml b/OsmAnd/res/drawable/ic_action_poi_name.xml
new file mode 100644
index 0000000000..82cc2b268b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_poi_name.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_point_add_destination.xml b/OsmAnd/res/drawable/ic_action_point_add_destination.xml
new file mode 100644
index 0000000000..f00c754ac7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_point_add_destination.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_point_destination.xml b/OsmAnd/res/drawable/ic_action_point_destination.xml
new file mode 100644
index 0000000000..798fc76605
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_point_destination.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_point_start.xml b/OsmAnd/res/drawable/ic_action_point_start.xml
new file mode 100644
index 0000000000..f8ac20230b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_point_start.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_postcode.xml b/OsmAnd/res/drawable/ic_action_postcode.xml
new file mode 100644
index 0000000000..f398c820ce
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_postcode.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_price_tag.xml b/OsmAnd/res/drawable/ic_action_price_tag.xml
new file mode 100644
index 0000000000..b297a78d09
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_price_tag.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_private_access.xml b/OsmAnd/res/drawable/ic_action_private_access.xml
new file mode 100644
index 0000000000..5da5a4c4a2
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_private_access.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_proxy.xml b/OsmAnd/res/drawable/ic_action_proxy.xml
new file mode 100644
index 0000000000..7c0786241a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_proxy.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_qrcode.xml b/OsmAnd/res/drawable/ic_action_qrcode.xml
new file mode 100644
index 0000000000..e765171a08
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_qrcode.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_read_article.xml b/OsmAnd/res/drawable/ic_action_read_article.xml
new file mode 100644
index 0000000000..eae820f577
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_read_article.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_read_later.xml b/OsmAnd/res/drawable/ic_action_read_later.xml
new file mode 100644
index 0000000000..ff9656c28f
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_read_later.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_read_later_fill.xml b/OsmAnd/res/drawable/ic_action_read_later_fill.xml
new file mode 100644
index 0000000000..71599a09ff
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_read_later_fill.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_read_text.xml b/OsmAnd/res/drawable/ic_action_read_text.xml
new file mode 100644
index 0000000000..2f9f185da3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_read_text.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_rec_start.xml b/OsmAnd/res/drawable/ic_action_rec_start.xml
new file mode 100644
index 0000000000..e3a58239d5
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_rec_start.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_rec_stop.xml b/OsmAnd/res/drawable/ic_action_rec_stop.xml
new file mode 100644
index 0000000000..7cfdd8b768
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_rec_stop.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_redo_dark.xml b/OsmAnd/res/drawable/ic_action_redo_dark.xml
new file mode 100644
index 0000000000..f26504738d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_redo_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_refresh_dark.xml b/OsmAnd/res/drawable/ic_action_refresh_dark.xml
new file mode 100644
index 0000000000..be6c424d77
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_refresh_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_relative_bearing.xml b/OsmAnd/res/drawable/ic_action_relative_bearing.xml
new file mode 100644
index 0000000000..01bb122e6f
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_relative_bearing.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_remove.xml b/OsmAnd/res/drawable/ic_action_remove.xml
new file mode 100644
index 0000000000..47ec79b234
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_remove.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_remove_dark.xml b/OsmAnd/res/drawable/ic_action_remove_dark.xml
new file mode 100644
index 0000000000..7517229944
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_remove_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_remove_small.xml b/OsmAnd/res/drawable/ic_action_remove_small.xml
new file mode 100644
index 0000000000..39573a4463
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_remove_small.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_reset_to_default_dark.xml b/OsmAnd/res/drawable/ic_action_reset_to_default_dark.xml
new file mode 100644
index 0000000000..3a7fd8014f
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_reset_to_default_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_road_works_dark.xml b/OsmAnd/res/drawable/ic_action_road_works_dark.xml
new file mode 100644
index 0000000000..e5973234e5
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_road_works_dark.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_direction_from_here.xml b/OsmAnd/res/drawable/ic_action_route_direction_from_here.xml
new file mode 100644
index 0000000000..bf44981328
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_direction_from_here.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_direction_here.xml b/OsmAnd/res/drawable/ic_action_route_direction_here.xml
new file mode 100644
index 0000000000..6b5150124b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_direction_here.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_distance.xml b/OsmAnd/res/drawable/ic_action_route_distance.xml
new file mode 100644
index 0000000000..c4b2219874
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_distance.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_first_intermediate.xml b/OsmAnd/res/drawable/ic_action_route_first_intermediate.xml
new file mode 100644
index 0000000000..243ea7e970
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_first_intermediate.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_first_intermediate_point.xml b/OsmAnd/res/drawable/ic_action_route_first_intermediate_point.xml
new file mode 100644
index 0000000000..c8a78d6f5c
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_first_intermediate_point.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_last_intermediate.xml b/OsmAnd/res/drawable/ic_action_route_last_intermediate.xml
new file mode 100644
index 0000000000..954e853ef5
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_last_intermediate.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_last_intermediate_point.xml b/OsmAnd/res/drawable/ic_action_route_last_intermediate_point.xml
new file mode 100644
index 0000000000..21a6575fc8
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_last_intermediate_point.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_points.xml b/OsmAnd/res/drawable/ic_action_route_points.xml
new file mode 100644
index 0000000000..9ad73c0425
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_points.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_subsequent_destination.xml b/OsmAnd/res/drawable/ic_action_route_subsequent_destination.xml
new file mode 100644
index 0000000000..3d61f06c0b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_subsequent_destination.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_route_subsequent_destination_point.xml b/OsmAnd/res/drawable/ic_action_route_subsequent_destination_point.xml
new file mode 100644
index 0000000000..7e2eae3115
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_route_subsequent_destination_point.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_ruler_circle.xml b/OsmAnd/res/drawable/ic_action_ruler_circle.xml
new file mode 100644
index 0000000000..c4a2a5da71
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_ruler_circle.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_ruler_unit.xml b/OsmAnd/res/drawable/ic_action_ruler_unit.xml
new file mode 100644
index 0000000000..cd984b47ed
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_ruler_unit.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_sadface.xml b/OsmAnd/res/drawable/ic_action_sadface.xml
new file mode 100644
index 0000000000..37a977c618
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_sadface.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_sand_clock.xml b/OsmAnd/res/drawable/ic_action_sand_clock.xml
new file mode 100644
index 0000000000..1859513abf
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_sand_clock.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_save.xml b/OsmAnd/res/drawable/ic_action_save.xml
new file mode 100644
index 0000000000..f34bfe76ac
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_save.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_save_to_file.xml b/OsmAnd/res/drawable/ic_action_save_to_file.xml
new file mode 100644
index 0000000000..eeaa54ca2e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_save_to_file.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_search_dark.xml b/OsmAnd/res/drawable/ic_action_search_dark.xml
new file mode 100644
index 0000000000..2b7c34a495
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_search_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_select_all.xml b/OsmAnd/res/drawable/ic_action_select_all.xml
new file mode 100644
index 0000000000..ad335374d6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_select_all.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_sensor_interaction.xml b/OsmAnd/res/drawable/ic_action_sensor_interaction.xml
new file mode 100644
index 0000000000..3344d176de
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_sensor_interaction.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_show_along_route.xml b/OsmAnd/res/drawable/ic_action_show_along_route.xml
new file mode 100644
index 0000000000..f0cd322cae
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_show_along_route.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_show_keypad_left.xml b/OsmAnd/res/drawable/ic_action_show_keypad_left.xml
new file mode 100644
index 0000000000..d85f3cd819
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_show_keypad_left.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_show_keypad_right.xml b/OsmAnd/res/drawable/ic_action_show_keypad_right.xml
new file mode 100644
index 0000000000..854435bb23
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_show_keypad_right.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_singleselect.xml b/OsmAnd/res/drawable/ic_action_singleselect.xml
new file mode 100644
index 0000000000..74df204e27
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_singleselect.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_snap_to_road.xml b/OsmAnd/res/drawable/ic_action_snap_to_road.xml
new file mode 100644
index 0000000000..a71eb5c47a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_snap_to_road.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_social_facebook.xml b/OsmAnd/res/drawable/ic_action_social_facebook.xml
new file mode 100644
index 0000000000..0d23a166c7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_social_facebook.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_social_instagram.xml b/OsmAnd/res/drawable/ic_action_social_instagram.xml
new file mode 100644
index 0000000000..959fddd8fc
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_social_instagram.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_social_reddit.xml b/OsmAnd/res/drawable/ic_action_social_reddit.xml
new file mode 100644
index 0000000000..f431822caa
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_social_reddit.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_social_twitter.xml b/OsmAnd/res/drawable/ic_action_social_twitter.xml
new file mode 100644
index 0000000000..cfd70196da
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_social_twitter.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_social_vk.xml b/OsmAnd/res/drawable/ic_action_social_vk.xml
new file mode 100644
index 0000000000..a68d07a973
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_social_vk.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_sort_by_date.xml b/OsmAnd/res/drawable/ic_action_sort_by_date.xml
new file mode 100644
index 0000000000..3fb93370a7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_sort_by_date.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_sort_by_name.xml b/OsmAnd/res/drawable/ic_action_sort_by_name.xml
new file mode 100644
index 0000000000..fde6aeab54
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_sort_by_name.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_sort_door_to_door.xml b/OsmAnd/res/drawable/ic_action_sort_door_to_door.xml
new file mode 100644
index 0000000000..8018747b72
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_sort_door_to_door.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_sort_reverse_order.xml b/OsmAnd/res/drawable/ic_action_sort_reverse_order.xml
new file mode 100644
index 0000000000..084d710082
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_sort_reverse_order.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_speed.xml b/OsmAnd/res/drawable/ic_action_speed.xml
new file mode 100644
index 0000000000..ca604d0071
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_speed.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_speed_16.xml b/OsmAnd/res/drawable/ic_action_speed_16.xml
new file mode 100644
index 0000000000..c2ab4e4077
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_speed_16.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_speed_limit.xml b/OsmAnd/res/drawable/ic_action_speed_limit.xml
new file mode 100644
index 0000000000..41c5acafcf
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_speed_limit.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_split_interval.xml b/OsmAnd/res/drawable/ic_action_split_interval.xml
new file mode 100644
index 0000000000..5ad5b54511
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_split_interval.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_start_navigation.xml b/OsmAnd/res/drawable/ic_action_start_navigation.xml
new file mode 100644
index 0000000000..94ab300bff
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_start_navigation.xml
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_street_name.xml b/OsmAnd/res/drawable/ic_action_street_name.xml
new file mode 100644
index 0000000000..975cd0105b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_street_name.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_subscription_osmand_live.xml b/OsmAnd/res/drawable/ic_action_subscription_osmand_live.xml
new file mode 100644
index 0000000000..a59469f5d8
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_subscription_osmand_live.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_sun.xml b/OsmAnd/res/drawable/ic_action_sun.xml
new file mode 100644
index 0000000000..5333d60818
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_sun.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_target.xml b/OsmAnd/res/drawable/ic_action_target.xml
new file mode 100644
index 0000000000..64b45d8b0e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_target.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_text_dark.xml b/OsmAnd/res/drawable/ic_action_text_dark.xml
new file mode 100644
index 0000000000..78d886bc98
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_text_dark.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time.xml b/OsmAnd/res/drawable/ic_action_time.xml
new file mode 100644
index 0000000000..6340a036a5
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time_end.xml b/OsmAnd/res/drawable/ic_action_time_end.xml
new file mode 100644
index 0000000000..2b5f6491cc
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time_end.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time_end_16.xml b/OsmAnd/res/drawable/ic_action_time_end_16.xml
new file mode 100644
index 0000000000..24fc60dc5b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time_end_16.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time_moving_16.xml b/OsmAnd/res/drawable/ic_action_time_moving_16.xml
new file mode 100644
index 0000000000..ddbf6294ee
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time_moving_16.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time_span.xml b/OsmAnd/res/drawable/ic_action_time_span.xml
new file mode 100644
index 0000000000..6e671cb3b6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time_span.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time_span_16.xml b/OsmAnd/res/drawable/ic_action_time_span_16.xml
new file mode 100644
index 0000000000..32fb889f14
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time_span_16.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time_start.xml b/OsmAnd/res/drawable/ic_action_time_start.xml
new file mode 100644
index 0000000000..6ec2801564
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time_start.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time_start_16.xml b/OsmAnd/res/drawable/ic_action_time_start_16.xml
new file mode 100644
index 0000000000..4651fc9b02
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time_start_16.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_time_to_distance.xml b/OsmAnd/res/drawable/ic_action_time_to_distance.xml
new file mode 100644
index 0000000000..4a5ba62f2a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_time_to_distance.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_track_16.xml b/OsmAnd/res/drawable/ic_action_track_16.xml
new file mode 100644
index 0000000000..d74b19c2d3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_track_16.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_trip_round.xml b/OsmAnd/res/drawable/ic_action_trip_round.xml
new file mode 100644
index 0000000000..110c5003f2
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_trip_round.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_turn_screen_on.xml b/OsmAnd/res/drawable/ic_action_turn_screen_on.xml
new file mode 100644
index 0000000000..27a05c8fd7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_turn_screen_on.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_type_add.xml b/OsmAnd/res/drawable/ic_action_type_add.xml
new file mode 100644
index 0000000000..c69c909432
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_type_add.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_type_add_16.xml b/OsmAnd/res/drawable/ic_action_type_add_16.xml
new file mode 100644
index 0000000000..37c066ac3d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_type_add_16.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_type_apply.xml b/OsmAnd/res/drawable/ic_action_type_apply.xml
new file mode 100644
index 0000000000..16dbce0804
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_type_apply.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_type_delete.xml b/OsmAnd/res/drawable/ic_action_type_delete.xml
new file mode 100644
index 0000000000..7c529b89f7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_type_delete.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_type_delete_16.xml b/OsmAnd/res/drawable/ic_action_type_delete_16.xml
new file mode 100644
index 0000000000..099bd7a557
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_type_delete_16.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_type_edit.xml b/OsmAnd/res/drawable/ic_action_type_edit.xml
new file mode 100644
index 0000000000..ba2426e4b7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_type_edit.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_type_edit_16.xml b/OsmAnd/res/drawable/ic_action_type_edit_16.xml
new file mode 100644
index 0000000000..86cc2e54e4
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_type_edit_16.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_undo.xml b/OsmAnd/res/drawable/ic_action_undo.xml
new file mode 100644
index 0000000000..ed22d5c219
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_undo.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_undo_dark.xml b/OsmAnd/res/drawable/ic_action_undo_dark.xml
new file mode 100644
index 0000000000..ebd6cadd9a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_undo_dark.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_unlimited_download.xml b/OsmAnd/res/drawable/ic_action_unlimited_download.xml
new file mode 100644
index 0000000000..ec968b55f9
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_unlimited_download.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_up_dark.xml b/OsmAnd/res/drawable/ic_action_up_dark.xml
new file mode 100644
index 0000000000..23e747e30c
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_up_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_user.xml b/OsmAnd/res/drawable/ic_action_user.xml
new file mode 100644
index 0000000000..bd3411c701
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_user.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_view.xml b/OsmAnd/res/drawable/ic_action_view.xml
new file mode 100644
index 0000000000..450277ecff
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_view.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_volume_mute.xml b/OsmAnd/res/drawable/ic_action_volume_mute.xml
new file mode 100644
index 0000000000..0c7e7bf00b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_volume_mute.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_volume_up.xml b/OsmAnd/res/drawable/ic_action_volume_up.xml
new file mode 100644
index 0000000000..7380693062
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_volume_up.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_weight_limit.xml b/OsmAnd/res/drawable/ic_action_weight_limit.xml
new file mode 100644
index 0000000000..89626d51c5
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_weight_limit.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_widget_collapse.xml b/OsmAnd/res/drawable/ic_action_widget_collapse.xml
new file mode 100644
index 0000000000..1aa4d820c0
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_widget_collapse.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_width_limit.xml b/OsmAnd/res/drawable/ic_action_width_limit.xml
new file mode 100644
index 0000000000..c46203c241
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_width_limit.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_wifi_off.xml b/OsmAnd/res/drawable/ic_action_wifi_off.xml
new file mode 100644
index 0000000000..03f1ef715c
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_wifi_off.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_wikipedia.xml b/OsmAnd/res/drawable/ic_action_wikipedia.xml
new file mode 100644
index 0000000000..13f4560f3b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_wikipedia.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_action_world_globe.xml b/OsmAnd/res/drawable/ic_action_world_globe.xml
new file mode 100644
index 0000000000..7f2c618140
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_world_globe.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_arrow_back.xml b/OsmAnd/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000..8976435481
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_arrow_forward.xml b/OsmAnd/res/drawable/ic_arrow_forward.xml
new file mode 100644
index 0000000000..e8b8bde9cb
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_arrow_forward.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_arrow_right_16.xml b/OsmAnd/res/drawable/ic_arrow_right_16.xml
new file mode 100644
index 0000000000..5fd69ae2b7
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_arrow_right_16.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_check_box_dark.xml b/OsmAnd/res/drawable/ic_check_box_dark.xml
new file mode 100644
index 0000000000..f1d66af32b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_check_box_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_check_box_light.xml b/OsmAnd/res/drawable/ic_check_box_light.xml
new file mode 100644
index 0000000000..6c160171b3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_check_box_light.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_check_box_outline_dark.xml b/OsmAnd/res/drawable/ic_check_box_outline_dark.xml
new file mode 100644
index 0000000000..d60e081c61
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_check_box_outline_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_check_box_outline_light.xml b/OsmAnd/res/drawable/ic_check_box_outline_light.xml
new file mode 100644
index 0000000000..b50cc02180
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_check_box_outline_light.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_christmas_illustration.xml b/OsmAnd/res/drawable/ic_christmas_illustration.xml
new file mode 100644
index 0000000000..7eb77a13cd
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_christmas_illustration.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_crashlog.xml b/OsmAnd/res/drawable/ic_crashlog.xml
new file mode 100644
index 0000000000..e02ffa1b4d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_crashlog.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_direction_arrow.xml b/OsmAnd/res/drawable/ic_direction_arrow.xml
new file mode 100644
index 0000000000..85ad64addd
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_direction_arrow.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_dot_position.xml b/OsmAnd/res/drawable/ic_dot_position.xml
new file mode 100644
index 0000000000..0e06be8759
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_dot_position.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_empty_state_search.xml b/OsmAnd/res/drawable/ic_empty_state_search.xml
new file mode 100644
index 0000000000..ee9efa0f6f
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_empty_state_search.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_extension_dark.xml b/OsmAnd/res/drawable/ic_extension_dark.xml
new file mode 100644
index 0000000000..e72096171e
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_extension_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_flat_list_dark.xml b/OsmAnd/res/drawable/ic_flat_list_dark.xml
new file mode 100644
index 0000000000..ebf9715ab4
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_flat_list_dark.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_group.xml b/OsmAnd/res/drawable/ic_group.xml
new file mode 100644
index 0000000000..361cf6b5f3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_group.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_grouped_by_type.xml b/OsmAnd/res/drawable/ic_grouped_by_type.xml
new file mode 100644
index 0000000000..c969a9e730
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_grouped_by_type.xml
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_logo_mapillary.xml b/OsmAnd/res/drawable/ic_logo_mapillary.xml
new file mode 100644
index 0000000000..5a82d9f1b1
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_logo_mapillary.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_overflow_menu_white.xml b/OsmAnd/res/drawable/ic_overflow_menu_white.xml
new file mode 100644
index 0000000000..817822f640
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_overflow_menu_white.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_pause.xml b/OsmAnd/res/drawable/ic_pause.xml
new file mode 100644
index 0000000000..ce71176eec
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_pause.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_play_dark.xml b/OsmAnd/res/drawable/ic_play_dark.xml
new file mode 100644
index 0000000000..71fe86476b
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_play_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_plugin_accessibility.xml b/OsmAnd/res/drawable/ic_plugin_accessibility.xml
new file mode 100644
index 0000000000..b5c06930ea
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_plugin_accessibility.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_plugin_developer.xml b/OsmAnd/res/drawable/ic_plugin_developer.xml
new file mode 100644
index 0000000000..2ac69460a4
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_plugin_developer.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_plugin_nautical_map.xml b/OsmAnd/res/drawable/ic_plugin_nautical_map.xml
new file mode 100644
index 0000000000..15ac70c2e6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_plugin_nautical_map.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_plugin_wikipedia.xml b/OsmAnd/res/drawable/ic_plugin_wikipedia.xml
new file mode 100644
index 0000000000..58f2c13582
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_plugin_wikipedia.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_sdcard.xml b/OsmAnd/res/drawable/ic_sdcard.xml
new file mode 100644
index 0000000000..5a14f5d10d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_sdcard.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_sdcard_16.xml b/OsmAnd/res/drawable/ic_sdcard_16.xml
new file mode 100644
index 0000000000..905b305f42
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_sdcard_16.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_show_on_map.xml b/OsmAnd/res/drawable/ic_show_on_map.xml
new file mode 100644
index 0000000000..91b337d1c3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_show_on_map.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_small_turn_left.xml b/OsmAnd/res/drawable/ic_small_turn_left.xml
new file mode 100644
index 0000000000..057298f967
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_small_turn_left.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_small_turn_right.xml b/OsmAnd/res/drawable/ic_small_turn_right.xml
new file mode 100644
index 0000000000..ca3939b6eb
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_small_turn_right.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_small_warning.xml b/OsmAnd/res/drawable/ic_small_warning.xml
new file mode 100644
index 0000000000..6d86be79d2
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_small_warning.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_sort_waypoint_dark.xml b/OsmAnd/res/drawable/ic_sort_waypoint_dark.xml
new file mode 100644
index 0000000000..314b683062
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_sort_waypoint_dark.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_tree_list_dark.xml b/OsmAnd/res/drawable/ic_tree_list_dark.xml
new file mode 100644
index 0000000000..bfce9cb0fa
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_tree_list_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_type_archive.xml b/OsmAnd/res/drawable/ic_type_archive.xml
new file mode 100644
index 0000000000..4cd9683fd6
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_type_archive.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_type_file.xml b/OsmAnd/res/drawable/ic_type_file.xml
new file mode 100644
index 0000000000..6450c92503
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_type_file.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/ic_type_img.xml b/OsmAnd/res/drawable/ic_type_img.xml
new file mode 100644
index 0000000000..868835e18a
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_type_img.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_type_video.xml b/OsmAnd/res/drawable/ic_type_video.xml
new file mode 100644
index 0000000000..4d95b88629
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_type_video.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_type_waypoints_group.xml b/OsmAnd/res/drawable/ic_type_waypoints_group.xml
new file mode 100644
index 0000000000..f3c1764ef0
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_type_waypoints_group.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/ic_world_globe_dark.xml b/OsmAnd/res/drawable/ic_world_globe_dark.xml
new file mode 100644
index 0000000000..53d0878af5
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_world_globe_dark.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/OsmAnd/res/drawable/list_destination.xml b/OsmAnd/res/drawable/list_destination.xml
new file mode 100644
index 0000000000..31ec9601a5
--- /dev/null
+++ b/OsmAnd/res/drawable/list_destination.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_intermediate.xml b/OsmAnd/res/drawable/list_intermediate.xml
new file mode 100644
index 0000000000..506de926d2
--- /dev/null
+++ b/OsmAnd/res/drawable/list_intermediate.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_startpoint.xml b/OsmAnd/res/drawable/list_startpoint.xml
new file mode 100644
index 0000000000..b3e7beb8d8
--- /dev/null
+++ b/OsmAnd/res/drawable/list_startpoint.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_pedestrian.xml b/OsmAnd/res/drawable/list_warnings_pedestrian.xml
new file mode 100644
index 0000000000..0771f1bf2a
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_pedestrian.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_pedestrian_us.xml b/OsmAnd/res/drawable/list_warnings_pedestrian_us.xml
new file mode 100644
index 0000000000..9d44085cd8
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_pedestrian_us.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_railways.xml b/OsmAnd/res/drawable/list_warnings_railways.xml
new file mode 100644
index 0000000000..f48278fc9a
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_railways.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_railways_us.xml b/OsmAnd/res/drawable/list_warnings_railways_us.xml
new file mode 100644
index 0000000000..47c21d7d97
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_railways_us.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_speed_camera.xml b/OsmAnd/res/drawable/list_warnings_speed_camera.xml
new file mode 100644
index 0000000000..1ba79d24b6
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_speed_camera.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_traffic_calming.xml b/OsmAnd/res/drawable/list_warnings_traffic_calming.xml
new file mode 100644
index 0000000000..80cd45f011
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_traffic_calming.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_traffic_calming_us.xml b/OsmAnd/res/drawable/list_warnings_traffic_calming_us.xml
new file mode 100644
index 0000000000..8726c4e8fa
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_traffic_calming_us.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_tunnel.xml b/OsmAnd/res/drawable/list_warnings_tunnel.xml
new file mode 100644
index 0000000000..0a4cc02633
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_tunnel.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/OsmAnd/res/drawable/list_warnings_tunnel_us.xml b/OsmAnd/res/drawable/list_warnings_tunnel_us.xml
new file mode 100644
index 0000000000..547bbd1806
--- /dev/null
+++ b/OsmAnd/res/drawable/list_warnings_tunnel_us.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml b/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
index e45238b1a9..ce91127dc5 100644
--- a/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
+++ b/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_photo_dark"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -90,4 +91,4 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml b/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml
index 6092fed905..bf4fcadbe5 100644
--- a/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml
+++ b/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/list_destination"/>
@@ -71,7 +72,7 @@
android:layout_height="48dp"
android:layout_gravity="top"
style="@style/Widget.AppCompat.Button.Borderless"
- android:src="@drawable/ic_action_remove_dark"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -84,13 +85,13 @@
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:drawableLeft="@drawable/ic_action_parking_dark"
+ osmand:drawableLeftCompat="@drawable/ic_action_parking_dark"
+ osmand:drawableStartCompat="@drawable/ic_action_parking_dark"
android:drawablePadding="12dp"
android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/find_parking"
- android:drawableStart="@drawable/ic_action_parking_dark"
android:paddingStart="8dp"
android:paddingEnd="8dp" />
@@ -108,15 +109,15 @@
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:drawableLeft="@drawable/ic_action_gdirections_dark"
- android:drawablePadding="12dp"
+ osmand:drawableLeftCompat="@drawable/ic_action_gdirections_dark"
+ osmand:drawableStartCompat="@drawable/ic_action_gdirections_dark"
+ android:drawablePadding="12dp"
android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/recalculate_route"
android:paddingStart="8dp"
- android:paddingEnd="8dp"
- android:drawableStart="@drawable/ic_action_gdirections_dark" />
+ android:paddingEnd="8dp" />
+ android:paddingStart="8dp" />
diff --git a/OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml b/OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
index c3027f6d23..3650661ac9 100644
--- a/OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
+++ b/OsmAnd/res/layout-land/fragment_coordinate_input_dialog.xml
@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
- android:src="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/bg_shadow_quick_input_left"/>
@@ -108,10 +108,10 @@
android:layout_height="match_parent"
android:layout_gravity="start"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_quick_input_right"/>
+ osmand:srcCompat="@drawable/bg_shadow_quick_input_right"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
index 71e85d2204..4168c6ff7f 100644
--- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml
@@ -204,16 +204,16 @@
android:layout_marginRight="@dimen/measurement_tool_button_margin"
android:layout_marginTop="@dimen/measurement_tool_button_margin"
android:background="?attr/btn_round"
- android:drawableLeft="@drawable/ic_action_plus"
- android:maxLines="1"
+ osmand:drawableLeftCompat="@drawable/ic_action_plus"
+ osmand:drawableStartCompat="@drawable/ic_action_plus"
+ android:maxLines="1"
android:minHeight="@dimen/measurement_tool_button_height"
android:paddingLeft="@dimen/measurement_tool_button_padding"
android:paddingRight="@dimen/measurement_tool_button_padding"
android:text="@string/shared_string_add"
android:textColor="@color/color_white"
android:paddingEnd="@dimen/measurement_tool_button_padding"
- android:paddingStart="@dimen/measurement_tool_button_padding"
- android:drawableStart="@drawable/ic_action_plus" />
+ android:paddingStart="@dimen/measurement_tool_button_padding" />
@@ -316,15 +316,15 @@
android:layout_marginRight="@dimen/measurement_tool_button_margin"
android:layout_marginTop="@dimen/measurement_tool_button_margin"
android:background="?attr/btn_round"
- android:drawableLeft="@drawable/ic_action_plus"
+ osmand:drawableLeftCompat="@drawable/ic_action_plus"
+ osmand:drawableStartCompat="@drawable/ic_action_plus"
android:minHeight="@dimen/measurement_tool_button_height"
android:paddingLeft="@dimen/measurement_tool_button_padding"
android:paddingRight="@dimen/measurement_tool_button_padding"
android:text="@string/shared_string_add"
android:textColor="@color/color_white"
android:paddingStart="@dimen/measurement_tool_button_padding"
- android:paddingEnd="@dimen/measurement_tool_button_padding"
- android:drawableStart="@drawable/ic_action_plus" />
+ android:paddingEnd="@dimen/measurement_tool_button_padding" />
diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index fd3da64e51..13e9699a17 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -34,7 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/warnings_limit"/>
+ osmand:srcCompat="@drawable/warnings_limit"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
@@ -227,7 +227,7 @@
android:layout_gravity="bottom"
android:background="@drawable/btn_circle"
android:contentDescription="@string/shared_string_my_location"
- tools:src="@drawable/ic_action_test_light"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout-land/map_hud_top.xml b/OsmAnd/res/layout-land/map_hud_top.xml
index 15a838d411..0002ab8498 100644
--- a/OsmAnd/res/layout-land/map_hud_top.xml
+++ b/OsmAnd/res/layout-land/map_hud_top.xml
@@ -45,7 +45,7 @@
android:layout_marginEnd="@dimen/content_padding_half"
android:layout_marginRight="@dimen/content_padding_half"
android:layout_marginBottom="@dimen/content_padding_half"
- android:src="@drawable/widget_coordinates_latitude_day" />
+ osmand:srcCompat="@drawable/widget_coordinates_latitude_day" />
+ osmand:srcCompat="@drawable/widget_coordinates_longitude_day" />
+ osmand:srcCompat="@drawable/ic_arrow_marker_diretion"/>
+ osmand:srcCompat="@drawable/ic_action_markers_list"/>
@@ -223,7 +223,7 @@
android:id="@+id/map_marker_arrow_2nd"
android:layout_width="60dp"
android:layout_height="24dp"
- android:src="@drawable/ic_arrow_marker_diretion"/>
+ osmand:srcCompat="@drawable/ic_arrow_marker_diretion"/>
+ osmand:srcCompat="@drawable/ic_action_markers_list"/>
@@ -423,7 +423,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"
- android:src="@drawable/ic_action_test_light"
+ osmand:srcCompat="@drawable/ic_action_remove_dark"
android:layout_marginStart="@dimen/map_button_margin"
android:layout_marginEnd="@dimen/map_button_margin" />
@@ -500,7 +500,7 @@
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:layout_gravity="center_vertical"
- android:src="@drawable/ic_overflow_menu_white"/>
+ osmand:srcCompat="@drawable/ic_overflow_menu_white"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -541,7 +541,7 @@
android:layout_height="56dp"
android:layout_gravity="top"
android:contentDescription="@string/back_to_search"
- android:src="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -705,7 +705,7 @@
android:layout_marginStart="@dimen/map_small_button_margin"
android:background="@drawable/btn_inset_circle_trans"
android:contentDescription="@string/map_widget_search"
- tools:src="@drawable/ic_action_test_light"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
@@ -804,7 +804,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_gravity="top|center_horizontal"
android:background="@drawable/btn_inset_circle_trans"
- android:src="@drawable/ic_action_test_light"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml b/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
index ea8e10caed..371e6d85bf 100644
--- a/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
+++ b/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_photo_dark"/>
+ app:srcCompat="@drawable/ic_action_building_number"/>
@@ -130,7 +130,7 @@
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginStart="@dimen/content_padding_small"
android:scaleType="centerInside"
- android:src="@drawable/ic_action_building_number"/>
+ app:srcCompat="@drawable/ic_action_building_number"/>
@@ -196,7 +196,7 @@
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginTop="10dp"
android:scaleType="center"
- android:src="@drawable/ic_action_note_dark"/>
+ app:srcCompat="@drawable/ic_action_note_dark"/>
diff --git a/OsmAnd/res/layout-land/track_details.xml b/OsmAnd/res/layout-land/track_details.xml
index 3a3491a8a3..ff8e6a48a2 100644
--- a/OsmAnd/res/layout-land/track_details.xml
+++ b/OsmAnd/res/layout-land/track_details.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -114,7 +115,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding"
- android:src="@drawable/ic_action_altitude_average"
+ osmand:srcCompat="@drawable/ic_action_altitude_average"
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginEnd="@dimen/list_content_padding" />
@@ -134,7 +135,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="8dp"
- android:src="@drawable/ic_action_arrow_drop_down"
+ osmand:srcCompat="@drawable/ic_action_arrow_drop_down"
android:layout_marginEnd="8dp" />
@@ -162,7 +163,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding"
- android:src="@drawable/ic_action_speed"
+ osmand:srcCompat="@drawable/ic_action_speed"
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginEnd="@dimen/list_content_padding" />
@@ -182,7 +183,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="8dp"
- android:src="@drawable/ic_action_arrow_drop_down"
+ osmand:srcCompat="@drawable/ic_action_arrow_drop_down"
android:layout_marginEnd="8dp" />
diff --git a/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml b/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
index c10f956045..26dbb00b99 100644
--- a/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
+++ b/OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/osmand_logo"/>
+ osmand:srcCompat="@drawable/osmand_logo"/>
+ osmand:srcCompat="@drawable/ic_action_photo_dark"/>
@@ -102,7 +103,7 @@
android:contentDescription="@string/shared_string_delete"
android:focusable="false"
android:scaleType="center"
- android:src="@drawable/ic_action_remove_dark" />
+ osmand:srcCompat="@drawable/ic_action_remove_dark" />
@@ -113,4 +114,4 @@
android:layout_marginTop="@dimen/content_padding_half"
android:background="?attr/divider_color_basic" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/ask_map_download_fragment.xml b/OsmAnd/res/layout/ask_map_download_fragment.xml
index a016d8547b..4d89639549 100644
--- a/OsmAnd/res/layout/ask_map_download_fragment.xml
+++ b/OsmAnd/res/layout/ask_map_download_fragment.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/bottom_sheet_item_btn_with_icon_and_text.xml b/OsmAnd/res/layout/bottom_sheet_item_btn_with_icon_and_text.xml
index 64e41e6502..531df2b54b 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_btn_with_icon_and_text.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_btn_with_icon_and_text.xml
@@ -17,7 +17,7 @@
android:layout_marginRight="@dimen/content_padding"
android:tint="?attr/active_color_basic"
tools:visibility="visible"
- android:src="@drawable/ic_action_plus"
+ osmand:srcCompat="@drawable/ic_action_plus"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
diff --git a/OsmAnd/res/layout/card_bottom_divider.xml b/OsmAnd/res/layout/card_bottom_divider.xml
index 8cfc595755..ff9ffe9ff9 100644
--- a/OsmAnd/res/layout/card_bottom_divider.xml
+++ b/OsmAnd/res/layout/card_bottom_divider.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom"/>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/card_top_divider.xml b/OsmAnd/res/layout/card_top_divider.xml
index b2036ad492..3392af74fa 100644
--- a/OsmAnd/res/layout/card_top_divider.xml
+++ b/OsmAnd/res/layout/card_top_divider.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/bg_shadow_list_top"/>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/change_fav_color.xml b/OsmAnd/res/layout/change_fav_color.xml
index 1ced3dbb18..5eb64adde7 100644
--- a/OsmAnd/res/layout/change_fav_color.xml
+++ b/OsmAnd/res/layout/change_fav_color.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_appearance" />
+ osmand:srcCompat="@drawable/ic_action_circle" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/change_order_item.xml b/OsmAnd/res/layout/change_order_item.xml
index 28bc6596aa..24be06973e 100644
--- a/OsmAnd/res/layout/change_order_item.xml
+++ b/OsmAnd/res/layout/change_order_item.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -89,4 +90,4 @@
android:foreground="@drawable/bg_contextmenu_shadow"
android:foregroundGravity="top|fill_horizontal"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/context_menu_top_shadow.xml b/OsmAnd/res/layout/context_menu_top_shadow.xml
index b500a81cf4..b0879cb66a 100644
--- a/OsmAnd/res/layout/context_menu_top_shadow.xml
+++ b/OsmAnd/res/layout/context_menu_top_shadow.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/bg_shadow_onmap" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/crash_title.xml b/OsmAnd/res/layout/crash_title.xml
index 908a5596a2..2511296737 100644
--- a/OsmAnd/res/layout/crash_title.xml
+++ b/OsmAnd/res/layout/crash_title.xml
@@ -37,6 +37,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_padding_small"
- android:src="@drawable/img_crash" />
+ osmand:srcCompat="@drawable/img_crash" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/current_gpx_item.xml b/OsmAnd/res/layout/current_gpx_item.xml
index f67b85825b..841120bf53 100644
--- a/OsmAnd/res/layout/current_gpx_item.xml
+++ b/OsmAnd/res/layout/current_gpx_item.xml
@@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginTop="@dimen/content_padding_small"
- android:src="@drawable/monitoring_rec_big"
+ osmand:srcCompat="@drawable/monitoring_rec_big"
android:visibility="visible"
android:layout_marginStart="@dimen/list_content_padding" />
@@ -98,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
- android:src="@drawable/ic_small_distance"
+ osmand:srcCompat="@drawable/ic_action_distance_16"
android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
+ android:paddingEnd="10dp" />
@@ -205,4 +205,4 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_error_fragment.xml b/OsmAnd/res/layout/dash_error_fragment.xml
index df3874320b..d36eebe377 100644
--- a/OsmAnd/res/layout/dash_error_fragment.xml
+++ b/OsmAnd/res/layout/dash_error_fragment.xml
@@ -1,5 +1,6 @@
diff --git a/OsmAnd/res/layout/dash_gpx_track_item.xml b/OsmAnd/res/layout/dash_gpx_track_item.xml
index 10d35005a0..83ba2f23c6 100644
--- a/OsmAnd/res/layout/dash_gpx_track_item.xml
+++ b/OsmAnd/res/layout/dash_gpx_track_item.xml
@@ -1,5 +1,6 @@
@@ -80,7 +81,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
- android:src="@drawable/ic_small_distance"
+ osmand:srcCompat="@drawable/ic_action_distance_16"
android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
@@ -172,7 +173,7 @@
android:layout_width="@dimen/list_item_height"
android:layout_height="@dimen/list_item_height"
android:background="?attr/dashboard_button"
- android:src="@drawable/ic_action_rec_stop"
+ osmand:srcCompat="@drawable/ic_action_rec_stop"
android:visibility="gone"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_navigation.xml b/OsmAnd/res/layout/dash_navigation.xml
index 59a4b5161d..3762a8bbc5 100644
--- a/OsmAnd/res/layout/dash_navigation.xml
+++ b/OsmAnd/res/layout/dash_navigation.xml
@@ -1,5 +1,6 @@
@@ -49,7 +50,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dashFavIconMargin"
android:background="?attr/dashboard_button"
- android:src="@drawable/ic_play_dark"
+ osmand:srcCompat="@drawable/ic_play_dark"
android:layout_marginStart="@dimen/dashFavIconMargin" />
+ osmand:srcCompat="@drawable/ic_action_remove_dark" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_parking_fragment.xml b/OsmAnd/res/layout/dash_parking_fragment.xml
index c5c39a166c..71ee96dd92 100644
--- a/OsmAnd/res/layout/dash_parking_fragment.xml
+++ b/OsmAnd/res/layout/dash_parking_fragment.xml
@@ -1,5 +1,6 @@
@@ -58,7 +59,7 @@
android:layout_height="@dimen/list_item_height"
android:layout_gravity="center_vertical"
android:background="?attr/dashboard_button"
- android:src="@drawable/ic_action_rec_stop"
+ osmand:srcCompat="@drawable/ic_action_rec_stop"
tools:visibility="visible" />
diff --git a/OsmAnd/res/layout/dash_storage_type_fragment.xml b/OsmAnd/res/layout/dash_storage_type_fragment.xml
index 7dd12f1bf0..6e55a07031 100644
--- a/OsmAnd/res/layout/dash_storage_type_fragment.xml
+++ b/OsmAnd/res/layout/dash_storage_type_fragment.xml
@@ -69,7 +69,7 @@
android:layout_gravity="center_vertical"
android:background="?attr/dashboard_button"
android:scaleType="center"
- android:src="@drawable/ic_action_edit_dark"/>
+ osmand:srcCompat="@drawable/ic_action_edit_dark"/>
@@ -135,4 +135,4 @@
osmand:typeface="@string/font_roboto_medium"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dashboard_toolbar.xml b/OsmAnd/res/layout/dashboard_toolbar.xml
index 077f46b456..36bab84985 100644
--- a/OsmAnd/res/layout/dashboard_toolbar.xml
+++ b/OsmAnd/res/layout/dashboard_toolbar.xml
@@ -34,7 +34,7 @@
android:layout_height="match_parent"
android:background="@drawable/dashboard_button_light"
android:scaleType="fitCenter"
- android:src="@drawable/ic_arrow_back"
+ app:srcCompat="@drawable/ic_arrow_back"
tools:visibility="visible"/>
+ app:srcCompat="@drawable/ic_configure_screen_dark"/>
+ app:srcCompat="@drawable/ic_action_done"/>
+ app:srcCompat="@drawable/ic_sort_waypoint_dark"/>
diff --git a/OsmAnd/res/layout/data_storage_list_item.xml b/OsmAnd/res/layout/data_storage_list_item.xml
index a6f02ba53d..b5c2fcf224 100644
--- a/OsmAnd/res/layout/data_storage_list_item.xml
+++ b/OsmAnd/res/layout/data_storage_list_item.xml
@@ -26,7 +26,7 @@
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_gravity="center"
- android:src="@drawable/mm_storage_tank"
+ osmand:srcCompat="@drawable/mm_storage_tank"
tools:tint="?attr/default_icon_color"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
@@ -86,7 +86,7 @@
android:layout_marginRight="@dimen/content_padding"
android:layout_gravity="center"
android:visibility="invisible"
- android:src="@drawable/mm_storage_tank"
+ osmand:srcCompat="@drawable/mm_storage_tank"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
diff --git a/OsmAnd/res/layout/data_storage_memory_used_item.xml b/OsmAnd/res/layout/data_storage_memory_used_item.xml
index 04b22e2e1a..0edf24f056 100644
--- a/OsmAnd/res/layout/data_storage_memory_used_item.xml
+++ b/OsmAnd/res/layout/data_storage_memory_used_item.xml
@@ -18,7 +18,7 @@
android:layout_gravity="center"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
- android:src="@drawable/mm_storage_tank"
+ osmand:srcCompat="@drawable/mm_storage_tank"
android:tint="?attr/default_icon_color"
tools:tint="?attr/default_icon_color"
android:layout_marginEnd="@dimen/content_padding"
diff --git a/OsmAnd/res/layout/dest_reached_menu_fragment.xml b/OsmAnd/res/layout/dest_reached_menu_fragment.xml
index 58b2d54387..b6e23e0d3f 100644
--- a/OsmAnd/res/layout/dest_reached_menu_fragment.xml
+++ b/OsmAnd/res/layout/dest_reached_menu_fragment.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/list_destination"/>
@@ -71,7 +72,7 @@
android:layout_height="48dp"
android:layout_gravity="top"
style="@style/Widget.AppCompat.Button.Borderless"
- android:src="@drawable/ic_action_remove_dark"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -84,13 +85,13 @@
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:drawableLeft="@drawable/ic_action_parking_dark"
+ osmand:drawableLeftCompat="@drawable/ic_action_parking_dark"
+ osmand:drawableStartCompat="@drawable/ic_action_parking_dark"
android:drawablePadding="12dp"
android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/find_parking"
- android:drawableStart="@drawable/ic_action_parking_dark"
android:paddingEnd="8dp"
android:paddingStart="8dp" />
@@ -108,15 +109,15 @@
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:drawableLeft="@drawable/ic_action_gdirections_dark"
- android:drawablePadding="12dp"
+ osmand:drawableLeftCompat="@drawable/ic_action_gdirections_dark"
+ osmand:drawableStartCompat="@drawable/ic_action_gdirections_dark"
+ android:drawablePadding="12dp"
android:gravity="start|center_vertical"
android:textColor="?android:textColorPrimary"
style="@style/Widget.AppCompat.Button.Borderless"
android:text="@string/recalculate_route"
android:paddingStart="8dp"
- android:paddingEnd="8dp"
- android:drawableStart="@drawable/ic_action_gdirections_dark" />
+ android:paddingEnd="8dp" />
+ android:paddingStart="8dp" />
diff --git a/OsmAnd/res/layout/dislike_title.xml b/OsmAnd/res/layout/dislike_title.xml
index 80b20bc859..42cc06b642 100644
--- a/OsmAnd/res/layout/dislike_title.xml
+++ b/OsmAnd/res/layout/dislike_title.xml
@@ -37,6 +37,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_padding_small"
- android:src="@drawable/img_get_feedback" />
+ osmand:srcCompat="@drawable/img_get_feedback" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/download_detailed_map_widget.xml b/OsmAnd/res/layout/download_detailed_map_widget.xml
index ac0b78fab4..339d378193 100644
--- a/OsmAnd/res/layout/download_detailed_map_widget.xml
+++ b/OsmAnd/res/layout/download_detailed_map_widget.xml
@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/card_content_padding_large"
- android:src="@drawable/img_download"
+ osmand:srcCompat="@drawable/img_download"
android:layout_marginStart="@dimen/card_content_padding_large" />
diff --git a/OsmAnd/res/layout/drawer_list_item.xml b/OsmAnd/res/layout/drawer_list_item.xml
index 9a326bed5f..864f9ca90f 100644
--- a/OsmAnd/res/layout/drawer_list_item.xml
+++ b/OsmAnd/res/layout/drawer_list_item.xml
@@ -17,7 +17,7 @@
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:layout_gravity="center_vertical"
- tools:src="@drawable/ic_action_gabout_dark" />
+ tools:src="@drawable/ic_action_info_dark" />
@@ -80,4 +80,4 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/favorite_category_dialog_item.xml b/OsmAnd/res/layout/favorite_category_dialog_item.xml
index 739926b2ca..b90dcab69c 100644
--- a/OsmAnd/res/layout/favorite_category_dialog_item.xml
+++ b/OsmAnd/res/layout/favorite_category_dialog_item.xml
@@ -1,15 +1,17 @@
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
+ android:orientation="horizontal">
+ android:paddingEnd="10dp" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml
index dd037282dd..4f1046a889 100644
--- a/OsmAnd/res/layout/favorites_list_item.xml
+++ b/OsmAnd/res/layout/favorites_list_item.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_direction_arrow" />
+ osmand:srcCompat="@drawable/ic_action_group_name_16" />
diff --git a/OsmAnd/res/layout/favourite_list_item.xml b/OsmAnd/res/layout/favourite_list_item.xml
index a7c073ec5e..30b66aae0c 100644
--- a/OsmAnd/res/layout/favourite_list_item.xml
+++ b/OsmAnd/res/layout/favourite_list_item.xml
@@ -1,4 +1,5 @@
+ osmand:srcCompat="@drawable/map_favorite" />
+ osmand:srcCompat="@drawable/osmand_logo"/>
@@ -638,7 +638,7 @@
android:layout_width="44dp"
android:layout_height="44dp"
android:contentDescription="@string/shared_string_cancel"
- android:src="@drawable/ic_action_close"
+ osmand:srcCompat="@drawable/ic_action_close"
android:tint="@color/icon_color_default_light"/>
diff --git a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
index ae0a0f0e09..a15bd4b214 100644
--- a/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
+++ b/OsmAnd/res/layout/fragment_data_storage_place_dialog.xml
@@ -1,4 +1,5 @@
@@ -91,7 +92,7 @@
android:layout_height="56dp"
android:paddingRight="@dimen/content_padding"
android:scaleType="center"
- android:src="@drawable/ic_action_phone"
+ osmand:srcCompat="@drawable/ic_action_phone"
tools:background="@color/color_warning"
android:paddingEnd="@dimen/content_padding" />
@@ -143,7 +144,7 @@
android:layout_height="56dp"
android:paddingRight="@dimen/content_padding"
android:scaleType="center"
- android:src="@drawable/ic_action_phone"
+ osmand:srcCompat="@drawable/ic_action_phone"
tools:background="@color/color_warning"
android:paddingEnd="@dimen/content_padding" />
@@ -192,7 +193,7 @@
android:layout_height="56dp"
android:paddingRight="@dimen/content_padding"
android:scaleType="center"
- android:src="@drawable/ic_sdcard"
+ osmand:srcCompat="@drawable/ic_sdcard"
tools:background="@color/color_warning"
android:paddingEnd="@dimen/content_padding" />
@@ -228,4 +229,4 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
index 878774dda9..44500852c6 100644
--- a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
+++ b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
@@ -553,9 +553,9 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom"
+ app:srcCompat="@drawable/bg_shadow_list_bottom"
android:visibility="gone"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index 764a99cc6f..30d2261406 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -78,7 +78,7 @@
android:layout_height="@dimen/context_menu_buttons_bottom_height"
android:layout_gravity="bottom"
android:background="@null"
- android:src="@drawable/ic_action_label"/>
+ app:srcCompat="@drawable/ic_action_label"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_import_complete.xml b/OsmAnd/res/layout/fragment_import_complete.xml
index f45e7faf74..84ce23e040 100644
--- a/OsmAnd/res/layout/fragment_import_complete.xml
+++ b/OsmAnd/res/layout/fragment_import_complete.xml
@@ -127,9 +127,9 @@
android:id="@+id/shadowView"
android:layout_width="match_parent"
android:layout_height="@dimen/abp__shadow_height"
- android:src="@drawable/preference_activity_action_bar_shadow"
+ osmand:srcCompat="@drawable/preference_activity_action_bar_shadow"
tools:ignore="ContentDescription" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_map_markers_groups.xml b/OsmAnd/res/layout/fragment_map_markers_groups.xml
index bd2f125853..82d9cea70f 100644
--- a/OsmAnd/res/layout/fragment_map_markers_groups.xml
+++ b/OsmAnd/res/layout/fragment_map_markers_groups.xml
@@ -20,7 +20,7 @@
android:layout_gravity="bottom|end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_action_plus"
+ app:srcCompat="@drawable/ic_action_plus"
app:backgroundTint="?attr/active_color_basic"
app:fabSize="normal"
app:useCompatPadding="true"/>
diff --git a/OsmAnd/res/layout/fragment_mapillary_filters.xml b/OsmAnd/res/layout/fragment_mapillary_filters.xml
index 5b8b0c4f9d..185109e39d 100644
--- a/OsmAnd/res/layout/fragment_mapillary_filters.xml
+++ b/OsmAnd/res/layout/fragment_mapillary_filters.xml
@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_onmap" />
+ osmand:srcCompat="@drawable/bg_shadow_onmap" />
+ tools:src="@drawable/ic_action_info_dark" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_measurement_tool.xml b/OsmAnd/res/layout/fragment_measurement_tool.xml
index dfdcb95550..52767c848d 100644
--- a/OsmAnd/res/layout/fragment_measurement_tool.xml
+++ b/OsmAnd/res/layout/fragment_measurement_tool.xml
@@ -155,7 +155,7 @@
android:layout_gravity="bottom"
android:alpha="0.5"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_onmap"/>
+ osmand:srcCompat="@drawable/bg_shadow_onmap"/>
@@ -334,13 +334,13 @@
android:layout_marginRight="@dimen/measurement_tool_button_margin"
android:layout_marginTop="@dimen/measurement_tool_button_margin"
android:background="?attr/btn_round"
- android:drawableLeft="@drawable/ic_action_plus"
+ osmand:drawableLeftCompat="@drawable/ic_action_plus"
+ osmand:drawableStartCompat="@drawable/ic_action_plus"
android:minHeight="@dimen/measurement_tool_button_height"
android:paddingLeft="@dimen/measurement_tool_button_padding"
android:paddingRight="@dimen/measurement_tool_button_padding"
android:text="@string/shared_string_add"
android:textColor="@color/color_white"
- android:drawableStart="@drawable/ic_action_plus"
android:paddingEnd="@dimen/measurement_tool_button_padding"
android:paddingStart="@dimen/measurement_tool_button_padding" />
diff --git a/OsmAnd/res/layout/fragment_plan_route_half_screen.xml b/OsmAnd/res/layout/fragment_plan_route_half_screen.xml
index 05f779b756..c7c7c169aa 100644
--- a/OsmAnd/res/layout/fragment_plan_route_half_screen.xml
+++ b/OsmAnd/res/layout/fragment_plan_route_half_screen.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/bg_shadow_onmap"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_reports.xml b/OsmAnd/res/layout/fragment_reports.xml
index 03371c2c17..da5e342cef 100644
--- a/OsmAnd/res/layout/fragment_reports.xml
+++ b/OsmAnd/res/layout/fragment_reports.xml
@@ -32,7 +32,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="center"
- android:src="@drawable/ic_action_data"/>
+ osmand:srcCompat="@drawable/ic_action_data"/>
@@ -78,7 +78,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="center"
- android:src="@drawable/ic_world_globe_dark"/>
+ osmand:srcCompat="@drawable/ic_world_globe_dark"/>
@@ -152,7 +152,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:scaleType="center"
- android:src="@drawable/ic_group"/>
+ osmand:srcCompat="@drawable/ic_group"/>
+ osmand:srcCompat="@drawable/ic_map"/>
+ osmand:srcCompat="@drawable/ic_action_bitcoin"/>
+ osmand:srcCompat="@drawable/ic_action_bitcoin"/>
+ osmand:srcCompat="@drawable/ic_group"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/fragment_show_all_routes.xml b/OsmAnd/res/layout/fragment_show_all_routes.xml
index 503a52bc16..dc4dd9742a 100644
--- a/OsmAnd/res/layout/fragment_show_all_routes.xml
+++ b/OsmAnd/res/layout/fragment_show_all_routes.xml
@@ -40,7 +40,7 @@
android:layout_marginStart="@dimen/content_padding_half"
android:background="@drawable/btn_circle_transparent_full"
android:contentDescription="@string/shared_string_back"
- android:src="@drawable/ic_arrow_back"
+ osmand:srcCompat="@drawable/ic_arrow_back"
android:tint="?attr/text_color_tab_active_white" />
@@ -133,7 +133,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/shared_string_close"
android:scaleType="center"
- android:src="@drawable/ic_arrow_back"
+ osmand:srcCompat="@drawable/ic_arrow_back"
android:tint="?attr/text_color_tab_active_white"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding" />
@@ -183,7 +183,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/print_route"
android:scaleType="center"
- android:src="@drawable/ic_action_gprint_dark"
+ osmand:srcCompat="@drawable/ic_action_gprint_dark"
android:tint="?attr/text_color_tab_active_white" />
@@ -215,7 +215,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_contextmenu_shadow" />
+ osmand:srcCompat="@drawable/bg_contextmenu_shadow" />
@@ -266,7 +266,7 @@
android:layout_gravity="bottom"
android:background="@drawable/btn_circle"
android:contentDescription="@string/shared_string_my_location"
- tools:src="@drawable/ic_action_test_light" />
+ tools:src="@drawable/ic_action_remove_dark" />
+ tools:src="@drawable/ic_action_remove_dark" />
+ tools:src="@drawable/ic_action_remove_dark" />
diff --git a/OsmAnd/res/layout/fragment_simple_list.xml b/OsmAnd/res/layout/fragment_simple_list.xml
index 2a193d183d..ff967140e4 100644
--- a/OsmAnd/res/layout/fragment_simple_list.xml
+++ b/OsmAnd/res/layout/fragment_simple_list.xml
@@ -18,7 +18,7 @@
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="52dp"
android:layout_height="52dp"
- android:src="@drawable/ic_arrow_back"/>
+ app:srcCompat="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/bg_shadow_onmap" />
@@ -116,7 +115,7 @@
android:gravity="center"
android:text="@string/shared_string_hillshade"
android:textSize="@dimen/default_desc_text_size"
- android:textStyle="bold" />
+ osmand:typeface="@string/font_roboto_medium" />
@@ -134,7 +133,7 @@
android:gravity="center"
android:text="@string/shared_string_slope"
android:textSize="@dimen/default_desc_text_size"
- android:textStyle="bold" />
+ osmand:typeface="@string/font_roboto_medium" />
@@ -345,7 +344,7 @@
android:layout_marginEnd="@dimen/content_padding"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
- android:src="@drawable/img_legend_slope" />
+ osmand:srcCompat="@drawable/img_legend_slope" />
+ osmand:srcCompat="@drawable/img_empty_state_terrain" />
diff --git a/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml b/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
index a281bd25fb..d4d121b978 100644
--- a/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
+++ b/OsmAnd/res/layout/fragment_wikivoyage_show_images_first_time.xml
@@ -25,7 +25,7 @@
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding"
android:paddingStart="@dimen/list_content_padding"
- android:src="@drawable/img_help_wikivoyage_show_image"
+ osmand:srcCompat="@drawable/img_help_wikivoyage_show_image"
android:contentDescription="@string/wikivoyage_download_pics" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/global_preference_toolbar.xml b/OsmAnd/res/layout/global_preference_toolbar.xml
index 2ad29a3a2f..4fcfbad367 100644
--- a/OsmAnd/res/layout/global_preference_toolbar.xml
+++ b/OsmAnd/res/layout/global_preference_toolbar.xml
@@ -30,7 +30,7 @@
android:layout_marginEnd="@dimen/content_padding"
android:contentDescription="@string/access_shared_string_navigate_up"
android:scaleType="fitCenter"
- android:src="@drawable/ic_arrow_back" />
+ app:srcCompat="@drawable/ic_arrow_back" />
+ app:srcCompat="@drawable/ic_arrow_back" />
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/gpx_item_altitude.xml b/OsmAnd/res/layout/gpx_item_altitude.xml
index ac2c321993..5c8204a1b3 100644
--- a/OsmAnd/res/layout/gpx_item_altitude.xml
+++ b/OsmAnd/res/layout/gpx_item_altitude.xml
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
- android:src="@drawable/ic_action_altitude_average"/>
+ osmand:srcCompat="@drawable/ic_action_altitude_average"/>
+ osmand:srcCompat="@drawable/ic_action_altitude_average"/>
+ osmand:srcCompat="@drawable/ic_action_altitude_ascent"/>
+ osmand:srcCompat="@drawable/ic_action_altitude_descent"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gpx_item_general.xml b/OsmAnd/res/layout/gpx_item_general.xml
index bc5ac53a2b..c3469f74ee 100644
--- a/OsmAnd/res/layout/gpx_item_general.xml
+++ b/OsmAnd/res/layout/gpx_item_general.xml
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
- android:src="@drawable/ic_action_polygom_dark"/>
+ osmand:srcCompat="@drawable/ic_action_polygom_dark"/>
+ osmand:srcCompat="@drawable/ic_action_time_start"/>
+ osmand:srcCompat="@drawable/ic_action_time_start"/>
+ osmand:srcCompat="@drawable/ic_action_time_start"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gpx_item_list_header.xml b/OsmAnd/res/layout/gpx_item_list_header.xml
index 7a881b66cf..4d1b8f4f54 100644
--- a/OsmAnd/res/layout/gpx_item_list_header.xml
+++ b/OsmAnd/res/layout/gpx_item_list_header.xml
@@ -39,7 +39,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_top"/>
+ osmand:srcCompat="@drawable/bg_shadow_list_top"/>
@@ -154,7 +154,7 @@
android:id="@+id/split_interval_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_action_arrow_drop_down"/>
+ osmand:srcCompat="@drawable/ic_action_arrow_drop_down"/>
@@ -187,7 +187,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/content_padding"
- android:src="@drawable/ic_action_circle"
+ osmand:srcCompat="@drawable/ic_action_circle"
android:paddingStart="@dimen/content_padding" />
diff --git a/OsmAnd/res/layout/gpx_item_speed.xml b/OsmAnd/res/layout/gpx_item_speed.xml
index 6ca3a3f41a..031b6e2de9 100644
--- a/OsmAnd/res/layout/gpx_item_speed.xml
+++ b/OsmAnd/res/layout/gpx_item_speed.xml
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
- android:src="@drawable/ic_action_speed"/>
+ osmand:srcCompat="@drawable/ic_action_speed"/>
+ osmand:srcCompat="@drawable/ic_action_max_speed"/>
+ osmand:srcCompat="@drawable/ic_action_time_span"/>
+ osmand:srcCompat="@drawable/ic_action_polygom_dark"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gpx_route_card.xml b/OsmAnd/res/layout/gpx_route_card.xml
index 7cba5e7b2d..19bb70fe9a 100644
--- a/OsmAnd/res/layout/gpx_route_card.xml
+++ b/OsmAnd/res/layout/gpx_route_card.xml
@@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_top" />
+ osmand:srcCompat="@drawable/bg_shadow_list_top" />
@@ -102,7 +102,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
diff --git a/OsmAnd/res/layout/gpx_track_item.xml b/OsmAnd/res/layout/gpx_track_item.xml
index b75caa74ec..c7825f8083 100644
--- a/OsmAnd/res/layout/gpx_track_item.xml
+++ b/OsmAnd/res/layout/gpx_track_item.xml
@@ -1,5 +1,6 @@
@@ -84,13 +85,14 @@
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:layout_marginEnd="@dimen/gpx_small_icon_margin"
- android:src="@drawable/ic_small_distance" />
+ osmand:srcCompat="@drawable/ic_action_distance_16" />
+ osmand:srcCompat="@drawable/ic_action_waypoint_16" />
@@ -120,13 +123,14 @@
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/gpx_small_icon_margin"
android:layout_marginEnd="@dimen/gpx_small_icon_margin"
- android:src="@drawable/ic_small_time" />
+ osmand:srcCompat="@drawable/ic_action_time_16" />
+ android:maxLines="1"
+ android:textSize="@dimen/default_sub_text_size" />
@@ -167,7 +172,7 @@
android:layout_marginLeft="@dimen/favorites_icon_right_margin"
android:layout_marginStart="@dimen/favorites_icon_right_margin"
android:background="?attr/dashboard_button"
- android:src="@drawable/ic_action_gsave_dark"
+ osmand:srcCompat="@drawable/ic_action_gsave_dark"
android:visibility="gone" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gpx_track_select_item.xml b/OsmAnd/res/layout/gpx_track_select_item.xml
index 21e925e64b..763c1aacbd 100644
--- a/OsmAnd/res/layout/gpx_track_select_item.xml
+++ b/OsmAnd/res/layout/gpx_track_select_item.xml
@@ -1,5 +1,6 @@
@@ -57,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/content_padding_half"
android:layout_marginRight="@dimen/content_padding_half"
- android:src="@drawable/ic_action_distance_16"
+ osmand:srcCompat="@drawable/ic_action_distance_16"
android:contentDescription="@string/distance" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/history_card_item.xml b/OsmAnd/res/layout/history_card_item.xml
index 0ad90cbafa..e24ae0bd0e 100644
--- a/OsmAnd/res/layout/history_card_item.xml
+++ b/OsmAnd/res/layout/history_card_item.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_group_name_16" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
diff --git a/OsmAnd/res/layout/layers_list_activity_item.xml b/OsmAnd/res/layout/layers_list_activity_item.xml
index 908cdc111b..c389243b60 100644
--- a/OsmAnd/res/layout/layers_list_activity_item.xml
+++ b/OsmAnd/res/layout/layers_list_activity_item.xml
@@ -1,5 +1,6 @@
-
-
diff --git a/OsmAnd/res/layout/list_item_icon24_and_menu.xml b/OsmAnd/res/layout/list_item_icon24_and_menu.xml
index c308a0fc55..5172422f94 100644
--- a/OsmAnd/res/layout/list_item_icon24_and_menu.xml
+++ b/OsmAnd/res/layout/list_item_icon24_and_menu.xml
@@ -15,7 +15,7 @@
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
- tools:src="@drawable/ic_action_gabout_dark" />
+ tools:src="@drawable/ic_action_info_dark" />
+ tools:src="@drawable/ic_action_info_dark" />
+ tools:src="@drawable/ic_action_info_dark"/>
+ tools:src="@drawable/ic_action_info_dark"/>
+ tools:src="@drawable/ic_action_info_dark"/>
+ tools:src="@drawable/ic_action_info_dark"/>
+ tools:src="@drawable/ic_action_info_dark"/>
+ tools:src="@drawable/ic_action_info_dark"/>
+ tools:src="@drawable/ic_action_info_dark" />
diff --git a/OsmAnd/res/layout/list_item_ui_customization.xml b/OsmAnd/res/layout/list_item_ui_customization.xml
index 4526820df9..49e9fe3c10 100644
--- a/OsmAnd/res/layout/list_item_ui_customization.xml
+++ b/OsmAnd/res/layout/list_item_ui_customization.xml
@@ -7,10 +7,10 @@
android:minHeight="@dimen/setting_list_item_large_height"
android:orientation="horizontal">
-
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom"/>
+ osmand:srcCompat="@drawable/bg_shadow_list_top"/>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/live_updates_header.xml b/OsmAnd/res/layout/live_updates_header.xml
index cb2e9943ab..4866fa54f7 100644
--- a/OsmAnd/res/layout/live_updates_header.xml
+++ b/OsmAnd/res/layout/live_updates_header.xml
@@ -32,7 +32,7 @@
+ app:srcCompat="@drawable/ic_action_osm_live"/>
+ app:srcCompat="@drawable/ic_action_done"/>
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 1d3043fb0a..420e6da6c4 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_polygom_dark" />
+ osmand:srcCompat="@drawable/ic_overflow_menu_white" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/local_index_live_updates_list_item.xml b/OsmAnd/res/layout/local_index_live_updates_list_item.xml
index 84bb83b093..1bb1c9f4fd 100644
--- a/OsmAnd/res/layout/local_index_live_updates_list_item.xml
+++ b/OsmAnd/res/layout/local_index_live_updates_list_item.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_overflow_menu_white" />
diff --git a/OsmAnd/res/layout/make_better_title.xml b/OsmAnd/res/layout/make_better_title.xml
index 1db04e7b95..1d4048e937 100644
--- a/OsmAnd/res/layout/make_better_title.xml
+++ b/OsmAnd/res/layout/make_better_title.xml
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="26dp"
android:layout_marginBottom="26dp"
- android:src="@drawable/img_feedback" />
+ osmand:srcCompat="@drawable/img_feedback" />
+ osmand:srcCompat="@drawable/ic_action_building_number"/>
@@ -528,7 +528,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/shared_string_collapse"
android:scaleType="center"
- android:src="@drawable/ic_arrow_back"
+ osmand:srcCompat="@drawable/ic_arrow_back"
tools:visibility="visible"/>
@@ -565,7 +565,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/shared_string_collapse"
android:scaleType="center"
- android:src="@drawable/ic_arrow_back"
+ osmand:srcCompat="@drawable/ic_arrow_back"
tools:visibility="visible"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index f36b62d0c5..0591484ada 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -31,7 +31,7 @@
android:layout_gravity="bottom|right"
android:visibility="gone"
tools:visibility="visible"
- tools:src="@drawable/ic_action_test_light"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
-->
@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/warnings_limit"/>
+ osmand:srcCompat="@drawable/warnings_limit"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/map_hud_quick_actions.xml b/OsmAnd/res/layout/map_hud_quick_actions.xml
index 3051116063..ad76138356 100644
--- a/OsmAnd/res/layout/map_hud_quick_actions.xml
+++ b/OsmAnd/res/layout/map_hud_quick_actions.xml
@@ -19,7 +19,7 @@
android:layout_gravity="bottom|end"
android:visibility="gone"
tools:visibility="visible"
- tools:src="@drawable/ic_action_test_light"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ osmand:srcCompat="@drawable/widget_coordinates_latitude_day" />
+ osmand:srcCompat="@drawable/widget_coordinates_longitude_day" />
@@ -286,7 +286,7 @@
android:layout_height="@dimen/map_address_height"
android:background="@drawable/btn_circle_transparent"
android:layout_gravity="center_vertical"
- tools:src="@drawable/ic_action_test_light"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
@@ -327,7 +327,7 @@
android:layout_height="56dp"
android:layout_gravity="top"
android:contentDescription="@string/back_to_search"
- android:src="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
+ osmand:srcCompat="@drawable/ic_arrow_marker_diretion"/>
+ osmand:srcCompat="@drawable/ic_action_markers_list"/>
@@ -563,7 +563,7 @@
android:id="@+id/map_marker_arrow_2nd"
android:layout_width="66dp"
android:layout_height="24dp"
- android:src="@drawable/ic_arrow_marker_diretion"/>
+ osmand:srcCompat="@drawable/ic_arrow_marker_diretion"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
@@ -699,7 +699,7 @@
android:layout_marginLeft="@dimen/map_small_button_margin"
android:layout_marginStart="@dimen/map_small_button_margin"
android:background="@drawable/btn_inset_circle_trans"
- tools:src="@drawable/ic_action_test_light"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
@@ -758,7 +758,7 @@
android:layout_height="@dimen/map_small_button_size"
android:layout_gravity="top|center_horizontal"
android:background="@drawable/btn_inset_circle_trans"
- tools:src="@drawable/ic_action_test_light"/>
+ tools:src="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/map_hud_widget.xml b/OsmAnd/res/layout/map_hud_widget.xml
index 6ad58ea6c4..670891cf21 100644
--- a/OsmAnd/res/layout/map_hud_widget.xml
+++ b/OsmAnd/res/layout/map_hud_widget.xml
@@ -1,5 +1,6 @@
@@ -51,7 +52,7 @@
android:layout_marginLeft="@dimen/map_widget_icon_margin"
android:layout_marginRight="@dimen/map_widget_icon_margin"
android:gravity="center"
- android:src="@drawable/ic_action_test_light"
+ osmand:srcCompat="@drawable/ic_action_remove_dark"
android:layout_marginEnd="@dimen/map_widget_icon_margin"
android:layout_marginStart="@dimen/map_widget_icon_margin" />
diff --git a/OsmAnd/res/layout/map_marker_item.xml b/OsmAnd/res/layout/map_marker_item.xml
index 131686f72b..4ec0d07e83 100644
--- a/OsmAnd/res/layout/map_marker_item.xml
+++ b/OsmAnd/res/layout/map_marker_item.xml
@@ -1,6 +1,7 @@
+ osmand:srcCompat="@drawable/ic_action_favorite"/>
@@ -119,7 +120,7 @@
android:contentDescription="@string/shared_string_more"
android:focusable="false"
android:scaleType="center"
- android:src="@drawable/map_overflow_menu_white"
+ osmand:srcCompat="@drawable/map_overflow_menu_white"
android:visibility="gone"
android:layout_marginEnd="2dp" />
@@ -133,7 +134,7 @@
android:contentDescription="@string/shared_string_delete"
android:focusable="false"
android:scaleType="center"
- android:src="@drawable/ic_action_remove_dark"
+ osmand:srcCompat="@drawable/ic_action_remove_dark"
android:layout_marginEnd="2dp" />
diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml
index 20cd3105a2..26960dbccf 100644
--- a/OsmAnd/res/layout/map_marker_item_new.xml
+++ b/OsmAnd/res/layout/map_marker_item_new.xml
@@ -1,5 +1,6 @@
@@ -46,7 +47,7 @@
android:layout_gravity="center_vertical"
android:scaleType="centerInside"
android:tint="?attr/secondary_icon_color"
- tools:src="@drawable/ic_action_reorder"/>
+ tools:src="@drawable/ic_action_item_move"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/map_marker_selection_fragment.xml b/OsmAnd/res/layout/map_marker_selection_fragment.xml
index 2dc564e4d8..5985e177f4 100644
--- a/OsmAnd/res/layout/map_marker_selection_fragment.xml
+++ b/OsmAnd/res/layout/map_marker_selection_fragment.xml
@@ -18,7 +18,7 @@
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="52dp"
android:layout_height="52dp"
- android:src="@drawable/ic_arrow_back"/>
+ app:srcCompat="@drawable/ic_arrow_back"/>
diff --git a/OsmAnd/res/layout/mapillary_install_dialog.xml b/OsmAnd/res/layout/mapillary_install_dialog.xml
index 5418e05d33..480e287002 100644
--- a/OsmAnd/res/layout/mapillary_install_dialog.xml
+++ b/OsmAnd/res/layout/mapillary_install_dialog.xml
@@ -1,5 +1,6 @@
@@ -18,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:src="@drawable/ic_logo_mapillary"/>
+ osmand:srcCompat="@drawable/ic_logo_mapillary"/>
@@ -33,7 +34,7 @@
android:layout_width="44dp"
android:layout_height="44dp"
android:background="?attr/selectableItemBackgroundBorderless"
- android:src="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/ic_arrow_back"/>
+ osmand:srcCompat="@drawable/ic_arrow_forward"/>
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 112275a5b7..6d932ed274 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -25,7 +25,7 @@
android:paddingStart="@dimen/content_padding"
android:paddingTop="@dimen/measurement_tool_content_padding_medium"
android:tint="?attr/secondary_icon_color"
- tools:src="@drawable/ic_action_reorder"/>
+ tools:src="@drawable/ic_action_item_move"/>
+ osmand:srcCompat="@drawable/ic_action_building_number"/>
diff --git a/OsmAnd/res/layout/move_marker_bottom_sheet.xml b/OsmAnd/res/layout/move_marker_bottom_sheet.xml
index 56a5e71ac1..22ad09231e 100644
--- a/OsmAnd/res/layout/move_marker_bottom_sheet.xml
+++ b/OsmAnd/res/layout/move_marker_bottom_sheet.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_photo_dark"/>
@@ -30,7 +30,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:contentDescription="@string/quick_action_new_action"
- android:src="@drawable/ic_action_marker_dark"
+ app:srcCompat="@drawable/ic_action_marker_dark"
android:visibility="gone"
app:backgroundTint="@color/fab_green"
app:fabSize="mini"
@@ -75,7 +75,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:contentDescription="@string/quick_action_new_action"
- android:src="@drawable/ic_action_markers_dark"
+ app:srcCompat="@drawable/ic_action_markers_dark"
android:visibility="gone"
app:backgroundTint="@color/fab_green"
app:fabSize="mini"
@@ -120,7 +120,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:contentDescription="@string/quick_action_new_action"
- android:src="@drawable/ic_action_polygom_dark"
+ app:srcCompat="@drawable/ic_action_polygom_dark"
android:visibility="gone"
app:backgroundTint="@color/fab_green"
app:fabSize="mini"
diff --git a/OsmAnd/res/layout/note.xml b/OsmAnd/res/layout/note.xml
index d34b8652ad..dfd6fd517c 100644
--- a/OsmAnd/res/layout/note.xml
+++ b/OsmAnd/res/layout/note.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_overflow_menu_white"/>
diff --git a/OsmAnd/res/layout/note_list_item.xml b/OsmAnd/res/layout/note_list_item.xml
index 2b94700967..ba748ff94f 100644
--- a/OsmAnd/res/layout/note_list_item.xml
+++ b/OsmAnd/res/layout/note_list_item.xml
@@ -1,5 +1,6 @@
@@ -79,7 +80,7 @@
android:contentDescription="@string/shared_string_more"
android:focusable="false"
android:padding="@dimen/content_padding"
- android:src="@drawable/ic_overflow_menu_white"/>
+ osmand:srcCompat="@drawable/ic_overflow_menu_white"/>
@@ -94,4 +95,4 @@
android:visibility="gone"
tools:visibility="visible"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/open_time_list_item.xml b/OsmAnd/res/layout/open_time_list_item.xml
index c588ed396b..d6386d0272 100644
--- a/OsmAnd/res/layout/open_time_list_item.xml
+++ b/OsmAnd/res/layout/open_time_list_item.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_time"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/osm_edit_list_item.xml b/OsmAnd/res/layout/osm_edit_list_item.xml
index 91942867b6..60cea386aa 100644
--- a/OsmAnd/res/layout/osm_edit_list_item.xml
+++ b/OsmAnd/res/layout/osm_edit_list_item.xml
@@ -1,5 +1,6 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/osm_live_banner_list_item.xml b/OsmAnd/res/layout/osm_live_banner_list_item.xml
index 1f7bd47818..6caea4bbeb 100644
--- a/OsmAnd/res/layout/osm_live_banner_list_item.xml
+++ b/OsmAnd/res/layout/osm_live_banner_list_item.xml
@@ -1,5 +1,6 @@
@@ -41,7 +41,7 @@
android:layout_gravity="center"
android:layout_marginBottom="@dimen/title_padding"
android:layout_marginTop="@dimen/list_header_padding"
- android:src="@drawable/img_help_osmand_live"/>
+ osmand:srcCompat="@drawable/img_help_osmand_live"/>
diff --git a/OsmAnd/res/layout/plan_route_gpx.xml b/OsmAnd/res/layout/plan_route_gpx.xml
index 91b9c70123..5405068566 100644
--- a/OsmAnd/res/layout/plan_route_gpx.xml
+++ b/OsmAnd/res/layout/plan_route_gpx.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_arrow_drop_down" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plan_route_info.xml b/OsmAnd/res/layout/plan_route_info.xml
index 505a1dcd4b..bc54e24f9a 100644
--- a/OsmAnd/res/layout/plan_route_info.xml
+++ b/OsmAnd/res/layout/plan_route_info.xml
@@ -62,7 +62,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:paddingLeft="@dimen/route_info_icon_padding_right"
android:paddingRight="@dimen/route_info_icon_padding_right"
- android:src="@drawable/ic_action_arrow_down"
+ osmand:srcCompat="@drawable/ic_action_arrow_down"
android:tint="@color/description_font_and_bottom_sheet_icons"
android:paddingStart="@dimen/route_info_icon_padding_right"
android:paddingEnd="@dimen/route_info_icon_padding_right" />
@@ -83,7 +83,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:paddingLeft="@dimen/route_info_icon_padding_right"
android:paddingRight="@dimen/route_info_icon_padding_right"
- android:src="@drawable/ic_overflow_menu_dark"
+ osmand:srcCompat="@drawable/ic_overflow_menu_dark"
android:paddingStart="@dimen/route_info_icon_padding_right"
android:paddingEnd="@dimen/route_info_icon_padding_right" />
@@ -116,7 +116,7 @@
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginBottom="@dimen/list_header_text_left_margin"
- android:src="@drawable/ic_action_location_color" />
+ osmand:srcCompat="@drawable/ic_action_location_color" />
@@ -236,7 +236,7 @@
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
android:layout_marginBottom="@dimen/list_header_text_left_margin"
- android:src="@drawable/ic_action_location_color" />
+ osmand:srcCompat="@drawable/ic_action_location_color" />
+ osmand:srcCompat="@drawable/ic_action_location_color" />
+ osmand:srcCompat="@drawable/bg_contextmenu_shadow" />
diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index 86b44e440e..7fe01e1dd5 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -13,16 +13,31 @@
android:orientation="vertical"
tools:context=".activities.PluginActivity">
-
+
+
+
+
+
+
+
+ osmand:srcCompat="@drawable/ic_overflow_menu_white"/>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/poi_filter_list_item.xml b/OsmAnd/res/layout/poi_filter_list_item.xml
index 00bc4c0caf..5bf47b67c8 100644
--- a/OsmAnd/res/layout/poi_filter_list_item.xml
+++ b/OsmAnd/res/layout/poi_filter_list_item.xml
@@ -27,7 +27,7 @@
android:id="@+id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
- android:src="@drawable/ic_action_search_dark"/>
+ osmand:srcCompat="@drawable/ic_action_search_dark"/>
@@ -96,7 +96,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:src="@drawable/ic_action_arrow_drop_up"
+ osmand:srcCompat="@drawable/ic_action_arrow_drop_up"
android:visibility="visible"/>
diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml
index bd11cf2f18..21bcb3ff57 100644
--- a/OsmAnd/res/layout/point_editor_fragment.xml
+++ b/OsmAnd/res/layout/point_editor_fragment.xml
@@ -76,7 +76,7 @@
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginTop="2dp"
android:scaleType="centerInside"
- android:src="@drawable/ic_action_building_number"/>
+ app:srcCompat="@drawable/ic_action_building_number"/>
@@ -139,7 +139,7 @@
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginTop="2dp"
android:scaleType="centerInside"
- android:src="@drawable/ic_action_building_number"/>
+ app:srcCompat="@drawable/ic_action_building_number"/>
@@ -207,7 +207,7 @@
android:layout_marginStart="@dimen/content_padding_small"
android:layout_marginTop="10dp"
android:scaleType="center"
- android:src="@drawable/ic_action_note_dark"/>
+ app:srcCompat="@drawable/ic_action_note_dark"/>
diff --git a/OsmAnd/res/layout/point_editor_fragment_new.xml b/OsmAnd/res/layout/point_editor_fragment_new.xml
index ebadf63d0d..55a5211821 100644
--- a/OsmAnd/res/layout/point_editor_fragment_new.xml
+++ b/OsmAnd/res/layout/point_editor_fragment_new.xml
@@ -34,7 +34,7 @@
android:layout_height="match_parent"
android:layout_gravity="end"
android:contentDescription="@string/replace_all"
- android:src="@drawable/ic_action_replace"
+ app:srcCompat="@drawable/ic_action_replace"
android:layout_marginRight="@dimen/content_padding_half"
android:layout_marginStart="@dimen/content_padding_half"
android:layout_marginLeft="@dimen/content_padding"
@@ -108,7 +108,7 @@
android:layout_gravity="end"
android:layout_margin="@dimen/content_padding_small"
android:contentDescription="@string/icon"
- android:src="@drawable/ic_action_home_dark" />
+ app:srcCompat="@drawable/ic_action_home_dark" />
@@ -227,7 +227,7 @@
android:layout_marginLeft="@dimen/content_padding_small"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
- android:src="@drawable/ic_action_folder"
+ app:srcCompat="@drawable/ic_action_folder"
android:contentDescription="@string/shared_string_list" />
@@ -472,7 +472,7 @@
android:layout_marginRight="@dimen/content_padding"
android:layout_gravity="center_vertical"
android:contentDescription="@string/delete_point"
- android:src="@drawable/ic_action_delete_dark" />
+ app:srcCompat="@drawable/ic_action_delete_dark" />
+ app:srcCompat="@drawable/ic_action_folder" />
+ tools:src="@drawable/ic_action_info_dark"/>
+ tools:src="@drawable/ic_action_info_dark"/>
+ app:srcCompat="@drawable/ic_action_arrow_drop_down"/>
@@ -118,7 +118,7 @@
android:id="@+id/selector_shadow"
android:layout_width="match_parent"
android:layout_height="@dimen/abp__shadow_height"
- android:src="@drawable/preference_activity_action_bar_shadow"
+ app:srcCompat="@drawable/preference_activity_action_bar_shadow"
android:visibility="gone"
tools:ignore="ContentDescription"/>
@@ -126,7 +126,7 @@
android:id="@+id/shadowView"
android:layout_width="match_parent"
android:layout_height="@dimen/abp__shadow_height"
- android:src="@drawable/preference_activity_action_bar_shadow"
+ app:srcCompat="@drawable/preference_activity_action_bar_shadow"
tools:ignore="ContentDescription" />
diff --git a/OsmAnd/res/layout/preference_dropdown_list.xml b/OsmAnd/res/layout/preference_dropdown_list.xml
index 391c25d08a..cbcdf340e9 100644
--- a/OsmAnd/res/layout/preference_dropdown_list.xml
+++ b/OsmAnd/res/layout/preference_dropdown_list.xml
@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:paddingRight="@dimen/content_padding"
- android:src="@drawable/ic_action_arrow_drop_down"
+ app:srcCompat="@drawable/ic_action_arrow_drop_down"
android:tint="@color/settings_divider"
android:paddingEnd="@dimen/content_padding" />
diff --git a/OsmAnd/res/layout/prev_route_card.xml b/OsmAnd/res/layout/prev_route_card.xml
index 5d8b272a15..695c9429a4 100644
--- a/OsmAnd/res/layout/prev_route_card.xml
+++ b/OsmAnd/res/layout/prev_route_card.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/bg_shadow_list_top" />
@@ -68,7 +69,7 @@
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
- android:src="@drawable/ic_action_previous_route"
+ osmand:srcCompat="@drawable/ic_action_previous_route"
android:tint="@color/description_font_and_bottom_sheet_icons" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
diff --git a/OsmAnd/res/layout/profile_data_list_item_group.xml b/OsmAnd/res/layout/profile_data_list_item_group.xml
index 0c0e897b55..bd07f7b54c 100644
--- a/OsmAnd/res/layout/profile_data_list_item_group.xml
+++ b/OsmAnd/res/layout/profile_data_list_item_group.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_arrow_down" />
-
+ android:layout_marginEnd="@dimen/content_padding_half"
+ android:layout_marginRight="@dimen/content_padding_half"
+ android:padding="@dimen/content_padding_small">
+
+
+
+
diff --git a/OsmAnd/res/layout/profile_list_item.xml b/OsmAnd/res/layout/profile_list_item.xml
index 832a8928fe..f9935e795a 100644
--- a/OsmAnd/res/layout/profile_list_item.xml
+++ b/OsmAnd/res/layout/profile_list_item.xml
@@ -1,5 +1,6 @@
diff --git a/OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml b/OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml
index 7a6d76e7a1..d8b1dafaaa 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml
@@ -23,7 +23,7 @@
android:layout_width="@dimen/toolbar_height"
android:layout_height="@dimen/toolbar_height"
android:contentDescription="@string/access_shared_string_navigate_up"
- android:src="@drawable/ic_arrow_back"
+ osmand:srcCompat="@drawable/ic_arrow_back"
android:tint="?attr/app_bar_primary_item_color"/>
+ osmand:srcCompat="@drawable/img_feature_purchased" />
@@ -153,4 +153,4 @@
android:background="?attr/wikivoyage_card_divider_color"
android:visibility="gone" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/purchase_dialog_card_header.xml b/OsmAnd/res/layout/purchase_dialog_card_header.xml
index 02450ebcd1..0c23076ef8 100644
--- a/OsmAnd/res/layout/purchase_dialog_card_header.xml
+++ b/OsmAnd/res/layout/purchase_dialog_card_header.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/img_logo_38dp_osmand"/>
@@ -32,7 +32,7 @@
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/dialog_content_margin"
android:layout_gravity="center"
- android:src="@drawable/img_feature_purchased"
+ osmand:srcCompat="@drawable/img_feature_purchased"
android:visibility="gone"
android:layout_marginEnd="@dimen/dialog_content_margin"
android:layout_marginStart="@dimen/list_content_padding" />
diff --git a/OsmAnd/res/layout/purchase_dialog_card_selected_row.xml b/OsmAnd/res/layout/purchase_dialog_card_selected_row.xml
index 2beac6ef3f..cec9670d09 100644
--- a/OsmAnd/res/layout/purchase_dialog_card_selected_row.xml
+++ b/OsmAnd/res/layout/purchase_dialog_card_selected_row.xml
@@ -20,7 +20,7 @@
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/dialog_content_margin"
android:scaleType="center"
- android:src="@drawable/ic_action_plus"
+ osmand:srcCompat="@drawable/ic_action_plus"
android:tint="?attr/wikivoyage_active_color"
android:layout_marginEnd="@dimen/dialog_content_margin"
android:layout_marginStart="@dimen/list_content_padding" />
@@ -32,7 +32,7 @@
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/dialog_content_margin"
android:layout_gravity="center"
- android:src="@drawable/img_feature_purchased"
+ osmand:srcCompat="@drawable/img_feature_purchased"
android:visibility="gone"
android:layout_marginEnd="@dimen/dialog_content_margin"
android:layout_marginStart="@dimen/list_content_padding" />
diff --git a/OsmAnd/res/layout/purchase_dialog_fragment.xml b/OsmAnd/res/layout/purchase_dialog_fragment.xml
index db87e7d0c6..c3111d52e7 100644
--- a/OsmAnd/res/layout/purchase_dialog_fragment.xml
+++ b/OsmAnd/res/layout/purchase_dialog_fragment.xml
@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/list_content_padding"
- android:src="@drawable/ic_arrow_back"
+ osmand:srcCompat="@drawable/ic_arrow_back"
android:tint="@color/icon_color_default_light" />
@@ -97,6 +99,8 @@
android:layout_height="wrap_content"
android:textColor="?attr/dialog_description_color"
android:textSize="@dimen/default_desc_text_size"
+ android:letterSpacing="@dimen/description_letter_spacing"
+ android:lineSpacingMultiplier="@dimen/info_description_line_spacing_multiplier"
osmand:typeface="@string/font_roboto_regular"
android:text="@string/osm_live_payment_subscription_management" />
diff --git a/OsmAnd/res/layout/quick_action_add_bug.xml b/OsmAnd/res/layout/quick_action_add_bug.xml
index 7e4d7edbf0..7effbd7311 100644
--- a/OsmAnd/res/layout/quick_action_add_bug.xml
+++ b/OsmAnd/res/layout/quick_action_add_bug.xml
@@ -1,5 +1,6 @@
@@ -39,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_top" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_add_dialog_item.xml b/OsmAnd/res/layout/quick_action_add_dialog_item.xml
index afec485ebf..8514443f58 100644
--- a/OsmAnd/res/layout/quick_action_add_dialog_item.xml
+++ b/OsmAnd/res/layout/quick_action_add_dialog_item.xml
@@ -1,6 +1,7 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_add_favorite.xml b/OsmAnd/res/layout/quick_action_add_favorite.xml
index fc19b20092..98a388d8b9 100644
--- a/OsmAnd/res/layout/quick_action_add_favorite.xml
+++ b/OsmAnd/res/layout/quick_action_add_favorite.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_top"/>
+ osmand:srcCompat="@drawable/ic_action_favorite"/>
@@ -161,7 +162,7 @@
android:layout_marginTop="2dp"
android:scaleType="centerInside"
android:tint="?attr/default_icon_color"
- android:src="@drawable/ic_action_folder"/>
+ osmand:srcCompat="@drawable/ic_action_folder"/>
@@ -223,6 +224,6 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_add_gpx.xml b/OsmAnd/res/layout/quick_action_add_gpx.xml
index e0779e0ff6..f9b3afec34 100644
--- a/OsmAnd/res/layout/quick_action_add_gpx.xml
+++ b/OsmAnd/res/layout/quick_action_add_gpx.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_top"/>
+ osmand:srcCompat="@drawable/ic_action_favorite"/>
@@ -161,7 +162,7 @@
android:layout_marginTop="2dp"
android:scaleType="centerInside"
android:tint="?attr/default_icon_color"
- android:src="@drawable/ic_action_folder"/>
+ osmand:srcCompat="@drawable/ic_action_folder"/>
@@ -223,6 +224,6 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_add_poi_layout.xml b/OsmAnd/res/layout/quick_action_add_poi_layout.xml
index 283adf32f9..4a3a9d9be7 100644
--- a/OsmAnd/res/layout/quick_action_add_poi_layout.xml
+++ b/OsmAnd/res/layout/quick_action_add_poi_layout.xml
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom"/>
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom"/>
+ osmand:srcCompat="@drawable/bg_shadow_list_top"/>
-
+
+ osmand:srcCompat="@drawable/ic_action_help"/>
@@ -116,7 +116,7 @@
-
+
@@ -124,7 +124,7 @@
-
+
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_create_edit_dialog.xml b/OsmAnd/res/layout/quick_action_create_edit_dialog.xml
index ca07a156ab..2cf6b1e43c 100644
--- a/OsmAnd/res/layout/quick_action_create_edit_dialog.xml
+++ b/OsmAnd/res/layout/quick_action_create_edit_dialog.xml
@@ -19,7 +19,7 @@
-
+
@@ -51,7 +51,7 @@
android:scaleType="centerInside"
app:tint="?attr/app_bar_primary_item_color"
android:layout_marginTop="24dp"
- android:src="@drawable/ic_action_flag"
+ app:srcCompat="@drawable/ic_action_flag"
android:layout_marginStart="16dp" />
+ app:srcCompat="@drawable/bg_shadow_list_bottom"/>
+ app:srcCompat="@drawable/bg_shadow_list_top"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/quick_action_list.xml b/OsmAnd/res/layout/quick_action_list.xml
index 8c8fbad246..ce07586e54 100644
--- a/OsmAnd/res/layout/quick_action_list.xml
+++ b/OsmAnd/res/layout/quick_action_list.xml
@@ -53,7 +53,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom"/>
+ app:srcCompat="@drawable/bg_shadow_list_bottom"/>
diff --git a/OsmAnd/res/layout/quick_action_list_item.xml b/OsmAnd/res/layout/quick_action_list_item.xml
index 4c8f921437..1661bc06cd 100644
--- a/OsmAnd/res/layout/quick_action_list_item.xml
+++ b/OsmAnd/res/layout/quick_action_list_item.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/quick_action_show_hide_poi.xml b/OsmAnd/res/layout/quick_action_show_hide_poi.xml
index 6b2c2f68e1..1944d0d1a7 100644
--- a/OsmAnd/res/layout/quick_action_show_hide_poi.xml
+++ b/OsmAnd/res/layout/quick_action_show_hide_poi.xml
@@ -66,6 +66,6 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom" />
+ app:srcCompat="@drawable/bg_shadow_list_bottom" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_start_stop_navigation.xml b/OsmAnd/res/layout/quick_action_start_stop_navigation.xml
index d57f93fb22..52fc067d48 100644
--- a/OsmAnd/res/layout/quick_action_start_stop_navigation.xml
+++ b/OsmAnd/res/layout/quick_action_start_stop_navigation.xml
@@ -1,6 +1,7 @@
@@ -19,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom"/>
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom"/>
+ osmand:srcCompat="@drawable/bg_shadow_list_top"/>
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom"/>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_switchable_action.xml b/OsmAnd/res/layout/quick_action_switchable_action.xml
index e2035042a6..9e387eb049 100644
--- a/OsmAnd/res/layout/quick_action_switchable_action.xml
+++ b/OsmAnd/res/layout/quick_action_switchable_action.xml
@@ -6,42 +6,50 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
-
+ android:background="?attr/bg_color">
-
+ android:background="?android:selectableItemBackground"
+ android:minHeight="56dp"
+ android:orientation="horizontal">
-
+
-
+
+
+
+
+
+ app:srcCompat="@drawable/bg_shadow_list_bottom" />
+ app:srcCompat="@drawable/bg_shadow_list_top" />
+ app:srcCompat="@drawable/bg_shadow_list_bottom" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/quick_action_switchable_item.xml b/OsmAnd/res/layout/quick_action_switchable_item.xml
index 6d70f38e53..d78a0dc45d 100644
--- a/OsmAnd/res/layout/quick_action_switchable_item.xml
+++ b/OsmAnd/res/layout/quick_action_switchable_item.xml
@@ -1,5 +1,6 @@
@@ -35,8 +36,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:scaleType="centerInside"
- android:tint="?attr/default_icon_color"
- android:src="@drawable/ic_map"
+ osmand:srcCompat="@drawable/ic_map"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" />
@@ -59,7 +59,7 @@
android:layout_gravity="center_vertical"
android:background="?attr/selectableItemBackground"
android:scaleType="centerInside"
- android:src="@drawable/ic_action_remove_dark"
+ osmand:srcCompat="@drawable/ic_action_remove_dark"
android:contentDescription="@string/action_delete"
android:tint="?attr/secondary_icon_color" />
diff --git a/OsmAnd/res/layout/quick_action_with_text.xml b/OsmAnd/res/layout/quick_action_with_text.xml
index 9ab78cd916..b7ec4f122a 100644
--- a/OsmAnd/res/layout/quick_action_with_text.xml
+++ b/OsmAnd/res/layout/quick_action_with_text.xml
@@ -1,6 +1,7 @@
@@ -20,5 +21,5 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/rate_us_title.xml b/OsmAnd/res/layout/rate_us_title.xml
index 2dbaae0b46..c072f27f35 100644
--- a/OsmAnd/res/layout/rate_us_title.xml
+++ b/OsmAnd/res/layout/rate_us_title.xml
@@ -37,6 +37,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_padding_small"
- android:src="@drawable/img_rate_us" />
+ osmand:srcCompat="@drawable/img_rate_us" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/recording_note_fragment_fullscreen.xml b/OsmAnd/res/layout/recording_note_fragment_fullscreen.xml
index 86663b0e84..d53e5c2fcc 100644
--- a/OsmAnd/res/layout/recording_note_fragment_fullscreen.xml
+++ b/OsmAnd/res/layout/recording_note_fragment_fullscreen.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_refresh_dark"/>
+ osmand:srcCompat="@drawable/ic_action_done"/>
+ osmand:srcCompat="@drawable/ic_action_device_camera"/>
+ osmand:srcCompat="@drawable/ic_action_route_distance" />
+ osmand:srcCompat="@drawable/ic_action_time_span" />
+ osmand:srcCompat="@drawable/ic_action_altitude_average" />
+ osmand:srcCompat="@drawable/ic_action_altitude_average" />
+ osmand:srcCompat="@drawable/ic_action_altitude_ascent" />
+ osmand:srcCompat="@drawable/ic_action_altitude_descent" />
@@ -108,7 +108,7 @@
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding"
android:contentDescription="@string/info_button"
- android:src="@drawable/ic_action_time"
+ osmand:srcCompat="@drawable/ic_action_time"
android:layout_marginEnd="@dimen/list_content_padding"
android:layout_marginStart="@dimen/list_content_padding" />
diff --git a/OsmAnd/res/layout/route_option_btn.xml b/OsmAnd/res/layout/route_option_btn.xml
index e2972c0538..b5b83c4bc1 100644
--- a/OsmAnd/res/layout/route_option_btn.xml
+++ b/OsmAnd/res/layout/route_option_btn.xml
@@ -23,7 +23,7 @@
android:paddingLeft="@dimen/route_info_icon_vertical_padding"
android:paddingRight="@dimen/route_info_icon_vertical_padding"
android:paddingTop="@dimen/route_info_icon_vertical_padding"
- android:src="@drawable/ic_action_edit_dark"
+ osmand:srcCompat="@drawable/ic_action_edit_dark"
tools:visibility="visible"
android:paddingEnd="@dimen/route_info_icon_vertical_padding"
android:paddingStart="@dimen/route_info_icon_vertical_padding" />
diff --git a/OsmAnd/res/layout/route_ped_info.xml b/OsmAnd/res/layout/route_ped_info.xml
index 3609f2e36f..0d5d12e996 100644
--- a/OsmAnd/res/layout/route_ped_info.xml
+++ b/OsmAnd/res/layout/route_ped_info.xml
@@ -43,7 +43,7 @@
android:layout_marginTop="@dimen/context_menu_padding_margin_large"
android:layout_marginEnd="@dimen/favorites_icon_right_margin"
android:layout_marginRight="@dimen/favorites_icon_right_margin"
- android:src="@drawable/ic_action_pedestrian_dark"
+ osmand:srcCompat="@drawable/ic_action_pedestrian_dark"
android:tint="@color/description_font_and_bottom_sheet_icons" />
+ osmand:srcCompat="@drawable/ic_action_favorite" />
+ osmand:srcCompat="@drawable/ic_action_remove_dark" />
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/route_waypoints_fragment.xml b/OsmAnd/res/layout/route_waypoints_fragment.xml
index 67017ae242..d4f4a0b0f0 100644
--- a/OsmAnd/res/layout/route_waypoints_fragment.xml
+++ b/OsmAnd/res/layout/route_waypoints_fragment.xml
@@ -37,7 +37,7 @@
android:paddingRight="@dimen/bottom_sheet_icon_margin"
android:paddingStart="@dimen/content_padding"
android:scaleType="center"
- android:src="@drawable/ic_arrow_back"
+ osmand:srcCompat="@drawable/ic_arrow_back"
android:visibility="visible" />
+ app:srcCompat="@drawable/ic_action_coordinates_latitude"/>
@@ -136,7 +136,7 @@
android:id="@+id/longitudeImage"
android:layout_width="54dp"
android:layout_height="wrap_content"
- android:src="@drawable/ic_action_coordinates_longitude"/>
+ app:srcCompat="@drawable/ic_action_coordinates_longitude"/>
@@ -185,7 +185,7 @@
android:id="@+id/northingImage"
android:layout_width="54dp"
android:layout_height="wrap_content"
- android:src="@drawable/ic_action_coordinates_latitude"/>
+ app:srcCompat="@drawable/ic_action_coordinates_latitude"/>
@@ -235,7 +235,7 @@
android:id="@+id/eastingImage"
android:layout_width="54dp"
android:layout_height="wrap_content"
- android:src="@drawable/ic_action_coordinates_longitude"/>
+ app:srcCompat="@drawable/ic_action_coordinates_longitude"/>
@@ -312,7 +312,7 @@
android:layout_gravity="end"
android:layout_marginRight="4dp"
android:contentDescription="@string/shared_string_clear"
- android:src="@drawable/ic_action_remove_dark"
+ app:srcCompat="@drawable/ic_action_remove_dark"
android:layout_marginEnd="4dp" />
@@ -358,7 +358,7 @@
android:layout_gravity="end"
android:layout_marginRight="4dp"
android:contentDescription="@string/shared_string_clear"
- android:src="@drawable/ic_action_remove_dark"
+ app:srcCompat="@drawable/ic_action_remove_dark"
android:layout_marginEnd="4dp" />
@@ -431,7 +431,7 @@
android:layout_gravity="end"
android:layout_marginRight="4dp"
android:contentDescription="@string/coords_format"
- android:src="@drawable/ic_action_arrow_drop_down"
+ app:srcCompat="@drawable/ic_action_arrow_drop_down"
android:layout_marginEnd="4dp" />
diff --git a/OsmAnd/res/layout/search_custom_list_item.xml b/OsmAnd/res/layout/search_custom_list_item.xml
index 31ae335f78..ee3ad0d3c4 100644
--- a/OsmAnd/res/layout/search_custom_list_item.xml
+++ b/OsmAnd/res/layout/search_custom_list_item.xml
@@ -24,7 +24,7 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="16dp"
android:scaleType="centerInside"
- android:src="@drawable/ic_action_search_dark"
+ osmand:srcCompat="@drawable/ic_action_search_dark"
android:layout_marginEnd="16dp" />
diff --git a/OsmAnd/res/layout/search_dialog_fragment.xml b/OsmAnd/res/layout/search_dialog_fragment.xml
index 08858c1b70..5f2e12f643 100644
--- a/OsmAnd/res/layout/search_dialog_fragment.xml
+++ b/OsmAnd/res/layout/search_dialog_fragment.xml
@@ -72,7 +72,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/shared_string_share"
- android:src="@drawable/ic_action_gshare_dark"/>
+ app:srcCompat="@drawable/ic_action_gshare_dark"/>
+ app:srcCompat="@drawable/ic_action_delete_dark"/>
@@ -137,7 +137,7 @@
android:layout_width="54dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:src="@drawable/ic_action_marker_dark"/>
+ app:srcCompat="@drawable/ic_action_marker_dark"/>
@@ -285,7 +285,7 @@
android:clickable="true"
android:contentDescription="@string/save_filter"
android:scaleType="center"
- android:src="@drawable/ic_action_save"
+ app:srcCompat="@drawable/ic_action_save"
tools:layout_marginBottom="@dimen/action_bar_image_top_margin_land"
android:layout_marginEnd="@dimen/fab_margin_right" />
diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml
index bf93b9ac4c..adaf8a5218 100644
--- a/OsmAnd/res/layout/search_history_list_item.xml
+++ b/OsmAnd/res/layout/search_history_list_item.xml
@@ -1,5 +1,6 @@
diff --git a/OsmAnd/res/layout/search_list_item.xml b/OsmAnd/res/layout/search_list_item.xml
index cd0d0d6e87..6f8cc3732f 100644
--- a/OsmAnd/res/layout/search_list_item.xml
+++ b/OsmAnd/res/layout/search_list_item.xml
@@ -1,5 +1,6 @@
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/search_poi_filter.xml b/OsmAnd/res/layout/search_poi_filter.xml
index 071ff9724a..945bae3c19 100644
--- a/OsmAnd/res/layout/search_poi_filter.xml
+++ b/OsmAnd/res/layout/search_poi_filter.xml
@@ -67,7 +67,7 @@
android:layout_height="48dp"
android:layout_marginTop="4dp"
android:contentDescription="@string/shared_string_more_actions"
- android:src="@drawable/ic_overflow_menu_white"/>
+ app:srcCompat="@drawable/ic_overflow_menu_white"/>
@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_onmap"
+ app:srcCompat="@drawable/bg_shadow_onmap"
android:visibility="gone"/>
diff --git a/OsmAnd/res/layout/search_text_layout.xml b/OsmAnd/res/layout/search_text_layout.xml
index 7e6af1306e..3056aec3df 100644
--- a/OsmAnd/res/layout/search_text_layout.xml
+++ b/OsmAnd/res/layout/search_text_layout.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchpoi.xml b/OsmAnd/res/layout/searchpoi.xml
index ef50c30c90..37172548d8 100644
--- a/OsmAnd/res/layout/searchpoi.xml
+++ b/OsmAnd/res/layout/searchpoi.xml
@@ -1,5 +1,6 @@
@@ -57,7 +58,7 @@
android:layout_gravity="center_vertical"
android:background="?attr/dashboard_button"
android:scaleType="center"
- android:src="@drawable/ic_overflow_menu_white" />
+ osmand:srcCompat="@drawable/ic_overflow_menu_white" />
-
+ osmand:srcCompat="@drawable/ic_overflow_menu_white"/>
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/select_gpx_appearance_title.xml b/OsmAnd/res/layout/select_gpx_appearance_title.xml
index 8df4a3b66f..ee0ce4b7b8 100644
--- a/OsmAnd/res/layout/select_gpx_appearance_title.xml
+++ b/OsmAnd/res/layout/select_gpx_appearance_title.xml
@@ -69,7 +69,7 @@
android:id="@+id/colorImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_action_circle"/>
+ osmand:srcCompat="@drawable/ic_action_circle"/>
diff --git a/OsmAnd/res/layout/select_voice_first.xml b/OsmAnd/res/layout/select_voice_first.xml
index ffdb911aa5..39c54ec11a 100644
--- a/OsmAnd/res/layout/select_voice_first.xml
+++ b/OsmAnd/res/layout/select_voice_first.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_arrow_drop_down"/>
diff --git a/OsmAnd/res/layout/split_segments_layout.xml b/OsmAnd/res/layout/split_segments_layout.xml
index 016549ddce..5703c4c875 100644
--- a/OsmAnd/res/layout/split_segments_layout.xml
+++ b/OsmAnd/res/layout/split_segments_layout.xml
@@ -117,7 +117,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:src="@drawable/ic_action_arrow_drop_down" />
+ app:srcCompat="@drawable/ic_action_arrow_drop_down" />
diff --git a/OsmAnd/res/layout/subscribe_email_header.xml b/OsmAnd/res/layout/subscribe_email_header.xml
index f638dd1cd5..8797f8f74d 100644
--- a/OsmAnd/res/layout/subscribe_email_header.xml
+++ b/OsmAnd/res/layout/subscribe_email_header.xml
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginRight="24dp"
- android:src="@drawable/ic_action_message"
+ osmand:srcCompat="@drawable/ic_action_message"
android:tint="?attr/color_dialog_buttons"
android:layout_marginEnd="24dp" />
diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml
index 222d976d22..553ba43045 100644
--- a/OsmAnd/res/layout/subscription_fragment.xml
+++ b/OsmAnd/res/layout/subscription_fragment.xml
@@ -19,7 +19,7 @@
android:layout_width="52dp"
android:layout_height="52dp"
android:contentDescription="@string/shared_string_close"
- android:src="@drawable/ic_action_remove_dark"/>
+ app:srcCompat="@drawable/ic_action_remove_dark"/>
+ app:srcCompat="@drawable/ic_world_globe_dark"/>
+ app:srcCompat="@drawable/ic_action_message"/>
+ app:srcCompat="@drawable/ic_action_user"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/switch_select_list_item.xml b/OsmAnd/res/layout/switch_select_list_item.xml
index a2ef25a71f..262237f6b7 100644
--- a/OsmAnd/res/layout/switch_select_list_item.xml
+++ b/OsmAnd/res/layout/switch_select_list_item.xml
@@ -1,5 +1,6 @@
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
diff --git a/OsmAnd/res/layout/track_content.xml b/OsmAnd/res/layout/track_content.xml
index 34256ac4d6..33fad5b8a8 100644
--- a/OsmAnd/res/layout/track_content.xml
+++ b/OsmAnd/res/layout/track_content.xml
@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:src="?attr/bottom_nav_shadow"
+ app:srcCompat="?attr/bottom_nav_shadow"
android:scaleType="fitXY"/>
diff --git a/OsmAnd/res/layout/track_details.xml b/OsmAnd/res/layout/track_details.xml
index 21bb4ff025..24903081af 100644
--- a/OsmAnd/res/layout/track_details.xml
+++ b/OsmAnd/res/layout/track_details.xml
@@ -1,5 +1,6 @@
@@ -63,7 +64,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="8dp"
- android:src="@drawable/ic_action_arrow_drop_down"
+ osmand:srcCompat="@drawable/ic_action_arrow_drop_down"
android:layout_marginEnd="8dp" />
@@ -91,7 +92,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding"
- android:src="@drawable/ic_action_marker_dark"
+ osmand:srcCompat="@drawable/ic_action_marker_dark"
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginEnd="@dimen/list_content_padding" />
@@ -111,7 +112,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="8dp"
- android:src="@drawable/ic_action_arrow_drop_down"
+ osmand:srcCompat="@drawable/ic_action_arrow_drop_down"
android:layout_marginEnd="8dp" />
diff --git a/OsmAnd/res/layout/transport_route_card.xml b/OsmAnd/res/layout/transport_route_card.xml
index db7fbccaf7..8551cfb914 100644
--- a/OsmAnd/res/layout/transport_route_card.xml
+++ b/OsmAnd/res/layout/transport_route_card.xml
@@ -144,6 +144,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
- android:src="@drawable/bg_shadow_list_bottom" />
+ osmand:srcCompat="@drawable/bg_shadow_list_bottom" />
\ No newline at end of file
diff --git a/OsmAnd/res/layout/waypoint_header.xml b/OsmAnd/res/layout/waypoint_header.xml
index 4c09a3dc9c..912c1e5176 100644
--- a/OsmAnd/res/layout/waypoint_header.xml
+++ b/OsmAnd/res/layout/waypoint_header.xml
@@ -66,7 +66,7 @@
android:layout_width="48dp"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackgroundBorderless"
- android:src="@drawable/ic_overflow_menu_white"
+ osmand:srcCompat="@drawable/ic_overflow_menu_white"
android:visibility="gone"/>
@@ -31,7 +32,7 @@
android:layout_width="56dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
- android:src="@drawable/ic_action_favorite"/>
+ osmand:srcCompat="@drawable/ic_action_favorite"/>
@@ -122,6 +123,6 @@
android:contentDescription="@string/shared_string_delete"
android:focusable="false"
android:scaleType="center"
- android:src="@drawable/ic_action_remove_dark"/>
+ osmand:srcCompat="@drawable/ic_action_remove_dark"/>
-
+
\ No newline at end of file
diff --git a/OsmAnd/res/layout/wikivoyage_start_editing_card.xml b/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
index 73afbf16d3..75be02aebc 100644
--- a/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_start_editing_card.xml
@@ -44,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/wikivoyage_explore_card_image_height"
android:contentDescription="@string/welcome_to_open_beta"
- android:src="@drawable/img_help_wikivoyage_contribute" />
+ osmand:srcCompat="@drawable/img_help_wikivoyage_contribute" />
diff --git a/OsmAnd/res/layout/wpt_list_item.xml b/OsmAnd/res/layout/wpt_list_item.xml
index cd16d5e7c4..7c02620483 100644
--- a/OsmAnd/res/layout/wpt_list_item.xml
+++ b/OsmAnd/res/layout/wpt_list_item.xml
@@ -134,7 +134,7 @@
android:layout_width="@dimen/acceptable_touch_radius"
android:layout_height="@dimen/acceptable_touch_radius"
android:scaleType="center"
- android:src="@drawable/ic_action_arrow_up"
+ osmand:srcCompat="@drawable/ic_action_arrow_up"
android:visibility="gone"
tools:visibility="visible"/>
@@ -144,7 +144,7 @@
android:layout_height="@dimen/acceptable_touch_radius"
android:background="?attr/dashboard_button"
android:contentDescription="@string/shared_string_more"
- android:src="@drawable/ic_overflow_menu_white"
+ osmand:srcCompat="@drawable/ic_overflow_menu_white"
android:visibility="visible"/>
diff --git a/OsmAnd/res/layout/xmas_dialog.xml b/OsmAnd/res/layout/xmas_dialog.xml
index e8123fc437..90d9f16fbd 100644
--- a/OsmAnd/res/layout/xmas_dialog.xml
+++ b/OsmAnd/res/layout/xmas_dialog.xml
@@ -1,5 +1,6 @@
@@ -17,7 +18,7 @@
+ osmand:srcCompat="@drawable/ic_christmas_illustration"/>
بحث عن إحداثيات