diff --git a/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java b/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java
index de443bedf3..2e1543321a 100644
--- a/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java
+++ b/OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java
@@ -54,7 +54,6 @@ public interface OsmAndCustomizationConstants {
 	String ROAD_STYLE_ID = RENDERING_ITEMS_ID_SCHEME + "road_style";
 	String TEXT_SIZE_ID = RENDERING_ITEMS_ID_SCHEME + "text_size";
 	String MAP_LANGUAGE_ID = RENDERING_ITEMS_ID_SCHEME + "map_language";
-	String TRANSPORT_RENDERING_ID = RENDERING_ITEMS_ID_SCHEME + "transport";
 	String DETAILS_ID = RENDERING_ITEMS_ID_SCHEME + "details";
 	String HIDE_ID = RENDERING_ITEMS_ID_SCHEME + "hide";
 	String ROUTES_ID = RENDERING_ITEMS_ID_SCHEME + "routes";
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
index ce83e15956..33553bc779 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java
@@ -428,7 +428,10 @@ public class BinaryMapIndexReader {
 				if (ls.endsWith("_2")) {
 					ls = ls.substring(0, ls.length() - "_2".length());
 				}
-				return ls.substring(0, ls.lastIndexOf('_')).replace('_', ' ');
+				if (ls.lastIndexOf('_') != -1) {
+					ls = ls.substring(0, ls.lastIndexOf('_')).replace('_', ' ');
+				}
+				return ls;
 			}
 
 		}
@@ -505,7 +508,7 @@ public class BinaryMapIndexReader {
 				finishInit.add(transportRoute);	
 			}
 			TIntObjectHashMap<String> 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 {
      * <code>optional bytes labelcoordinates = 8;</code>
      *
      * <pre>
-     * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 31th zoom
+     * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 26th zoom
      * </pre>
      */
     boolean hasLabelcoordinates();
@@ -12400,7 +12400,7 @@ public final class OsmandOdb {
      * <code>optional bytes labelcoordinates = 8;</code>
      *
      * <pre>
-     * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 31th zoom
+     * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 26th zoom
      * </pre>
      */
     com.google.protobuf.ByteString getLabelcoordinates();
@@ -12715,7 +12715,7 @@ public final class OsmandOdb {
      * <code>optional bytes labelcoordinates = 8;</code>
      *
      * <pre>
-     * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 31th zoom
+     * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 26th zoom
      * </pre>
      */
     public boolean hasLabelcoordinates() {
@@ -12725,7 +12725,7 @@ public final class OsmandOdb {
      * <code>optional bytes labelcoordinates = 8;</code>
      *
      * <pre>
-     * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 31th zoom
+     * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 26th zoom
      * </pre>
      */
     public com.google.protobuf.ByteString getLabelcoordinates() {
@@ -13466,7 +13466,7 @@ public final class OsmandOdb {
        * <code>optional bytes labelcoordinates = 8;</code>
        *
        * <pre>
-       * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 31th zoom
+       * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 26th zoom
        * </pre>
        */
       public boolean hasLabelcoordinates() {
@@ -13476,7 +13476,7 @@ public final class OsmandOdb {
        * <code>optional bytes labelcoordinates = 8;</code>
        *
        * <pre>
-       * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 31th zoom
+       * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 26th zoom
        * </pre>
        */
       public com.google.protobuf.ByteString getLabelcoordinates() {
@@ -13486,7 +13486,7 @@ public final class OsmandOdb {
        * <code>optional bytes labelcoordinates = 8;</code>
        *
        * <pre>
-       * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 31th zoom
+       * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 26th zoom
        * </pre>
        */
       public Builder setLabelcoordinates(com.google.protobuf.ByteString value) {
@@ -13502,7 +13502,7 @@ public final class OsmandOdb {
        * <code>optional bytes labelcoordinates = 8;</code>
        *
        * <pre>
-       * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 31th zoom
+       * pair x,y (sint32) of delta encoded to center of &lt;coordinates&gt; 26th zoom
        * </pre>
        */
       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;
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    java.util.List<net.osmand.binary.OsmandOdb.IncompleteTransportRoute> 
+        getRoutesList();
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    net.osmand.binary.OsmandOdb.IncompleteTransportRoute getRoutes(int index);
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    int getRoutesCount();
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    java.util.List<? extends net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder> 
+        getRoutesOrBuilderList();
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    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<net.osmand.binary.OsmandOdb.IncompleteTransportRoute>();
+                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<IncompleteTransportRoutes> PARSER =
+        new com.google.protobuf.AbstractParser<IncompleteTransportRoutes>() {
+      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<IncompleteTransportRoutes> getParserForType() {
+      return PARSER;
+    }
+
+    // repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;
+    public static final int ROUTES_FIELD_NUMBER = 6;
+    private java.util.List<net.osmand.binary.OsmandOdb.IncompleteTransportRoute> routes_;
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    public java.util.List<net.osmand.binary.OsmandOdb.IncompleteTransportRoute> getRoutesList() {
+      return routes_;
+    }
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    public java.util.List<? extends net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder> 
+        getRoutesOrBuilderList() {
+      return routes_;
+    }
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    public int getRoutesCount() {
+      return routes_.size();
+    }
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    public net.osmand.binary.OsmandOdb.IncompleteTransportRoute getRoutes(int index) {
+      return routes_.get(index);
+    }
+    /**
+     * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+     */
+    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<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<net.osmand.binary.OsmandOdb.IncompleteTransportRoute> routes_ =
+        java.util.Collections.emptyList();
+      private void ensureRoutesIsMutable() {
+        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+          routes_ = new java.util.ArrayList<net.osmand.binary.OsmandOdb.IncompleteTransportRoute>(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_;
+
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public java.util.List<net.osmand.binary.OsmandOdb.IncompleteTransportRoute> getRoutesList() {
+        if (routesBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(routes_);
+        } else {
+          return routesBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public int getRoutesCount() {
+        if (routesBuilder_ == null) {
+          return routes_.size();
+        } else {
+          return routesBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public net.osmand.binary.OsmandOdb.IncompleteTransportRoute getRoutes(int index) {
+        if (routesBuilder_ == null) {
+          return routes_.get(index);
+        } else {
+          return routesBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      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;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      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;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      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;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      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;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      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;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      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;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      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;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public Builder clearRoutes() {
+        if (routesBuilder_ == null) {
+          routes_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          routesBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public Builder removeRoutes(int index) {
+        if (routesBuilder_ == null) {
+          ensureRoutesIsMutable();
+          routes_.remove(index);
+          onChanged();
+        } else {
+          routesBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder getRoutesBuilder(
+          int index) {
+        return getRoutesFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder getRoutesOrBuilder(
+          int index) {
+        if (routesBuilder_ == null) {
+          return routes_.get(index);  } else {
+          return routesBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public java.util.List<? extends net.osmand.binary.OsmandOdb.IncompleteTransportRouteOrBuilder> 
+           getRoutesOrBuilderList() {
+        if (routesBuilder_ != null) {
+          return routesBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(routes_);
+        }
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder addRoutesBuilder() {
+        return getRoutesFieldBuilder().addBuilder(
+            net.osmand.binary.OsmandOdb.IncompleteTransportRoute.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder addRoutesBuilder(
+          int index) {
+        return getRoutesFieldBuilder().addBuilder(
+            index, net.osmand.binary.OsmandOdb.IncompleteTransportRoute.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .OsmAnd.OBF.IncompleteTransportRoute routes = 6;</code>
+       */
+      public java.util.List<net.osmand.binary.OsmandOdb.IncompleteTransportRoute.Builder> 
+           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;
+    /**
+     * <code>required uint64 id = 1;</code>
+     */
+    boolean hasId();
+    /**
+     * <code>required uint64 id = 1;</code>
+     */
+    long getId();
+
+    // optional uint32 type = 3;
+    /**
+     * <code>optional uint32 type = 3;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    boolean hasType();
+    /**
+     * <code>optional uint32 type = 3;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    int getType();
+
+    // optional uint32 operator = 4;
+    /**
+     * <code>optional uint32 operator = 4;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    boolean hasOperator();
+    /**
+     * <code>optional uint32 operator = 4;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    int getOperator();
+
+    // optional uint32 ref = 5;
+    /**
+     * <code>optional uint32 ref = 5;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    boolean hasRef();
+    /**
+     * <code>optional uint32 ref = 5;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    int getRef();
+
+    // required uint32 routeRef = 7;
+    /**
+     * <code>required uint32 routeRef = 7;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to the route in TransportRoute section
+     * </pre>
+     */
+    boolean hasRouteRef();
+    /**
+     * <code>required uint32 routeRef = 7;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to the route in TransportRoute section
+     * </pre>
+     */
+    int getRouteRef();
+
+    // repeated uint32 missingStops = 8;
+    /**
+     * <code>repeated uint32 missingStops = 8;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to stops that are missing
+     * </pre>
+     */
+    java.util.List<java.lang.Integer> getMissingStopsList();
+    /**
+     * <code>repeated uint32 missingStops = 8;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to stops that are missing
+     * </pre>
+     */
+    int getMissingStopsCount();
+    /**
+     * <code>repeated uint32 missingStops = 8;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to stops that are missing
+     * </pre>
+     */
+    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<java.lang.Integer>();
+                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<java.lang.Integer>();
+                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<IncompleteTransportRoute> PARSER =
+        new com.google.protobuf.AbstractParser<IncompleteTransportRoute>() {
+      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<IncompleteTransportRoute> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // required uint64 id = 1;
+    public static final int ID_FIELD_NUMBER = 1;
+    private long id_;
+    /**
+     * <code>required uint64 id = 1;</code>
+     */
+    public boolean hasId() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>required uint64 id = 1;</code>
+     */
+    public long getId() {
+      return id_;
+    }
+
+    // optional uint32 type = 3;
+    public static final int TYPE_FIELD_NUMBER = 3;
+    private int type_;
+    /**
+     * <code>optional uint32 type = 3;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    public boolean hasType() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional uint32 type = 3;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    public int getType() {
+      return type_;
+    }
+
+    // optional uint32 operator = 4;
+    public static final int OPERATOR_FIELD_NUMBER = 4;
+    private int operator_;
+    /**
+     * <code>optional uint32 operator = 4;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    public boolean hasOperator() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional uint32 operator = 4;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    public int getOperator() {
+      return operator_;
+    }
+
+    // optional uint32 ref = 5;
+    public static final int REF_FIELD_NUMBER = 5;
+    private int ref_;
+    /**
+     * <code>optional uint32 ref = 5;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    public boolean hasRef() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
+     * <code>optional uint32 ref = 5;</code>
+     *
+     * <pre>
+     * reference in string table
+     * </pre>
+     */
+    public int getRef() {
+      return ref_;
+    }
+
+    // required uint32 routeRef = 7;
+    public static final int ROUTEREF_FIELD_NUMBER = 7;
+    private int routeRef_;
+    /**
+     * <code>required uint32 routeRef = 7;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to the route in TransportRoute section
+     * </pre>
+     */
+    public boolean hasRouteRef() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    /**
+     * <code>required uint32 routeRef = 7;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to the route in TransportRoute section
+     * </pre>
+     */
+    public int getRouteRef() {
+      return routeRef_;
+    }
+
+    // repeated uint32 missingStops = 8;
+    public static final int MISSINGSTOPS_FIELD_NUMBER = 8;
+    private java.util.List<java.lang.Integer> missingStops_;
+    /**
+     * <code>repeated uint32 missingStops = 8;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to stops that are missing
+     * </pre>
+     */
+    public java.util.List<java.lang.Integer>
+        getMissingStopsList() {
+      return missingStops_;
+    }
+    /**
+     * <code>repeated uint32 missingStops = 8;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to stops that are missing
+     * </pre>
+     */
+    public int getMissingStopsCount() {
+      return missingStops_.size();
+    }
+    /**
+     * <code>repeated uint32 missingStops = 8;</code>
+     *
+     * <pre>
+     * shift from OsmAndTransportIndex to stops that are missing
+     * </pre>
+     */
+    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<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_ ;
+      /**
+       * <code>required uint64 id = 1;</code>
+       */
+      public boolean hasId() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>required uint64 id = 1;</code>
+       */
+      public long getId() {
+        return id_;
+      }
+      /**
+       * <code>required uint64 id = 1;</code>
+       */
+      public Builder setId(long value) {
+        bitField0_ |= 0x00000001;
+        id_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required uint64 id = 1;</code>
+       */
+      public Builder clearId() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        id_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 type = 3;
+      private int type_ ;
+      /**
+       * <code>optional uint32 type = 3;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public boolean hasType() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional uint32 type = 3;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public int getType() {
+        return type_;
+      }
+      /**
+       * <code>optional uint32 type = 3;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public Builder setType(int value) {
+        bitField0_ |= 0x00000002;
+        type_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 type = 3;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public Builder clearType() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        type_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 operator = 4;
+      private int operator_ ;
+      /**
+       * <code>optional uint32 operator = 4;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public boolean hasOperator() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional uint32 operator = 4;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public int getOperator() {
+        return operator_;
+      }
+      /**
+       * <code>optional uint32 operator = 4;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public Builder setOperator(int value) {
+        bitField0_ |= 0x00000004;
+        operator_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 operator = 4;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public Builder clearOperator() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        operator_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // optional uint32 ref = 5;
+      private int ref_ ;
+      /**
+       * <code>optional uint32 ref = 5;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public boolean hasRef() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional uint32 ref = 5;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public int getRef() {
+        return ref_;
+      }
+      /**
+       * <code>optional uint32 ref = 5;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public Builder setRef(int value) {
+        bitField0_ |= 0x00000008;
+        ref_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional uint32 ref = 5;</code>
+       *
+       * <pre>
+       * reference in string table
+       * </pre>
+       */
+      public Builder clearRef() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        ref_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // required uint32 routeRef = 7;
+      private int routeRef_ ;
+      /**
+       * <code>required uint32 routeRef = 7;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to the route in TransportRoute section
+       * </pre>
+       */
+      public boolean hasRouteRef() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      /**
+       * <code>required uint32 routeRef = 7;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to the route in TransportRoute section
+       * </pre>
+       */
+      public int getRouteRef() {
+        return routeRef_;
+      }
+      /**
+       * <code>required uint32 routeRef = 7;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to the route in TransportRoute section
+       * </pre>
+       */
+      public Builder setRouteRef(int value) {
+        bitField0_ |= 0x00000010;
+        routeRef_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required uint32 routeRef = 7;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to the route in TransportRoute section
+       * </pre>
+       */
+      public Builder clearRouteRef() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        routeRef_ = 0;
+        onChanged();
+        return this;
+      }
+
+      // repeated uint32 missingStops = 8;
+      private java.util.List<java.lang.Integer> missingStops_ = java.util.Collections.emptyList();
+      private void ensureMissingStopsIsMutable() {
+        if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+          missingStops_ = new java.util.ArrayList<java.lang.Integer>(missingStops_);
+          bitField0_ |= 0x00000020;
+         }
+      }
+      /**
+       * <code>repeated uint32 missingStops = 8;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to stops that are missing
+       * </pre>
+       */
+      public java.util.List<java.lang.Integer>
+          getMissingStopsList() {
+        return java.util.Collections.unmodifiableList(missingStops_);
+      }
+      /**
+       * <code>repeated uint32 missingStops = 8;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to stops that are missing
+       * </pre>
+       */
+      public int getMissingStopsCount() {
+        return missingStops_.size();
+      }
+      /**
+       * <code>repeated uint32 missingStops = 8;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to stops that are missing
+       * </pre>
+       */
+      public int getMissingStops(int index) {
+        return missingStops_.get(index);
+      }
+      /**
+       * <code>repeated uint32 missingStops = 8;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to stops that are missing
+       * </pre>
+       */
+      public Builder setMissingStops(
+          int index, int value) {
+        ensureMissingStopsIsMutable();
+        missingStops_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 missingStops = 8;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to stops that are missing
+       * </pre>
+       */
+      public Builder addMissingStops(int value) {
+        ensureMissingStopsIsMutable();
+        missingStops_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 missingStops = 8;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to stops that are missing
+       * </pre>
+       */
+      public Builder addAllMissingStops(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureMissingStopsIsMutable();
+        super.addAll(values, missingStops_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 missingStops = 8;</code>
+       *
+       * <pre>
+       * shift from OsmAndTransportIndex to stops that are missing
+       * </pre>
+       */
+      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;
+    /**
+     * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+     */
+    boolean hasIncompleteRoutes();
+    /**
+     * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+     */
+    net.osmand.binary.OsmandOdb.IncompleteTransportRoutes getIncompleteRoutes();
+    /**
+     * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+     */
+    net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder getIncompleteRoutesOrBuilder();
+
     // required .OsmAnd.OBF.StringTable stringTable = 9;
     /**
      * <code>required .OsmAnd.OBF.StringTable stringTable = 9;</code>
@@ -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_;
+    /**
+     * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+     */
+    public boolean hasIncompleteRoutes() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
+     * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+     */
+    public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes getIncompleteRoutes() {
+      return incompleteRoutes_;
+    }
+    /**
+     * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+     */
+    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 {
      * <code>required .OsmAnd.OBF.StringTable stringTable = 9;</code>
      */
     public boolean hasStringTable() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
+      return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
      * <code>required .OsmAnd.OBF.StringTable stringTable = 9;</code>
@@ -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_;
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      public boolean hasIncompleteRoutes() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes getIncompleteRoutes() {
+        if (incompleteRoutesBuilder_ == null) {
+          return incompleteRoutes_;
+        } else {
+          return incompleteRoutesBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      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;
+      }
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      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;
+      }
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      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;
+      }
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      public Builder clearIncompleteRoutes() {
+        if (incompleteRoutesBuilder_ == null) {
+          incompleteRoutes_ = net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.getDefaultInstance();
+          onChanged();
+        } else {
+          incompleteRoutesBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000008);
+        return this;
+      }
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      public net.osmand.binary.OsmandOdb.IncompleteTransportRoutes.Builder getIncompleteRoutesBuilder() {
+        bitField0_ |= 0x00000008;
+        onChanged();
+        return getIncompleteRoutesFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      public net.osmand.binary.OsmandOdb.IncompleteTransportRoutesOrBuilder getIncompleteRoutesOrBuilder() {
+        if (incompleteRoutesBuilder_ != null) {
+          return incompleteRoutesBuilder_.getMessageOrBuilder();
+        } else {
+          return incompleteRoutes_;
+        }
+      }
+      /**
+       * <code>optional .OsmAnd.OBF.IncompleteTransportRoutes incompleteRoutes = 8;</code>
+       */
+      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 {
        * <code>required .OsmAnd.OBF.StringTable stringTable = 9;</code>
        */
       public boolean hasStringTable() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+        return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
        * <code>required .OsmAnd.OBF.StringTable stringTable = 9;</code>
@@ -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;
       }
       /**
        * <code>required .OsmAnd.OBF.StringTable stringTable = 9;</code>
        */
       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 <T extends SearchCoreAPI> SearchResultCollection shallowSearch(Class<T> cl,
-																		  String text, final ResultMatcher<SearchResult> matcher) throws IOException {
+	public <T extends SearchCoreAPI> SearchResultCollection shallowSearch(Class<T> cl, String text,
+	                                                                      ResultMatcher<SearchResult> matcher) throws IOException {
+		return shallowSearch(cl, text, matcher, true, true);
+	}
+
+	public <T extends SearchCoreAPI> SearchResultCollection shallowSearch(Class<T> cl, String text,
+	                                                                      final ResultMatcher<SearchResult> 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-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 @@
     <string name="time_zone">Часавы пояс</string>
     <string name="units_and_formats">Адзінкі вымярэння і фарматы</string>
     <string name="unit_of_length_descr">Змяніць адзінкі вымярэння адлегласці.</string>
-    <string name="unit_of_length">Адзінкі даўжыні</string>
+    <string name="unit_of_length">Адзінкі вымярэння адлегласці</string>
     <string name="unit_of_speed_system_descr">Вызначце адзінку вымярэння хуткасці.</string>
     <string name="unit_of_speed_system">Адзінка вымярэння хуткасці</string>
     <string name="buffer_time_descr">Максімальны час захоўвання пунктаў у буферы</string>
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 @@
     <string name="shared_string_disable">Pois käytöstä</string>
     <string name="shared_string_save">Tallenna</string>
     <string name="add_device">Lisää laite</string>
+    <string name="si_mi_feet">Mailia/jalkaa</string>
+    <string name="si_min_m">Minuutteja mailille</string>
+    <string name="si_min_km">Minuutteja kilometrille</string>
+    <string name="si_m_s">Metriä sekunnissa</string>
+    <string name="si_mph">Mailia tunnissa</string>
+    <string name="si_kmh">Kilometriä tunnissa</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="km_h">km/h</string>
+    <string name="m_s">m/s</string>
+    <string name="min_km">min/km</string>
+    <string name="min_mile">min/m</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="shared_string_settings">Asetukset</string>
+    <string name="shared_string_cancel">Peruuta</string>
+    <string name="shared_string_continue">Jatka</string>
+    <string name="shared_string_back">Takaisin</string>
+    <string name="shared_string_share">Jaa</string>
+    <string name="shared_string_install">Asenna</string>
+    <string name="shared_string_off">Pois päältä</string>
+    <string name="shared_string_all">Kaikki</string>
+    <string name="shared_string_close">Sulje</string>
+    <string name="shared_string_exit">Poistu</string>
+    <string name="shared_string_name">Nimi</string>
+    <string name="shared_string_status">Tila</string>
+    <string name="shared_string_enabled">Käytössä</string>
+    <string name="shared_string_hide">Piilota</string>
+    <string name="shared_string_add">Lisää</string>
+    <string name="shared_string_map">Kartta</string>
+    <string name="average_speed">Keskinopeus</string>
+    <string name="average_altitude">Keskimääräinen korkeus</string>
+    <string name="shared_string_appearance">Ulkoasu</string>
+    <string name="shared_string_ok">OK</string>
+    <string name="shared_string_search">Etsi</string>
+    <string name="altitude">Korkeus</string>
+    <string name="shared_string_enable">Ota käyttöön</string>
+    <string name="shared_string_select">Valitse</string>
+    <string name="shared_string_apply">Käytä</string>
 </resources>
\ 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 @@
     <string name="minutes_format">%1$d min</string>
     <string name="hours_format">%1$d h</string>
     <string name="shared_string_install">Instalar</string>
-    <string name="shared_string_share">Compartillar</string>
+    <string name="shared_string_share">Compartir</string>
     <string name="shared_string_back">Voltar</string>
     <string name="shared_string_add">Engadir</string>
     <string name="enter_another_device_name">Escolle un nome que aínda non está a ser empregado</string>
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 @@
 		<shape android:shape="rectangle">
 			<solid android:color="@android:color/transparent" />
 			<corners android:radius="4dp" />
-			<stroke android:width="1dp" android:color="?attr/stroked_buttons_and_links_outline" />
+			<stroke android:width="1dp" android:color="@color/stroked_buttons_and_links_outline_dark" />
 		</shape>
 	</item>
 </selector>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="rectangle">
+			<solid android:color="@android:color/transparent" />
+			<corners android:radius="4dp" />
+			<stroke android:width="1dp" android:color="@color/stroked_buttons_and_links_outline_light" />
+		</shape>
+	</item>
+</selector>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape>
-			<size
-				android:width="360dp"
-				android:height="144dp"/>
-			<solid android:color="#ff8f00"/>
-		</shape>
-	</item>
-	<item>
-		<bitmap android:src="@drawable/ic_extension_dark" android:gravity="center" />
-	</item>
-</layer-list>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,4C6,2.8954 6.8954,2 8,2H20C21.1046,2 22,2.8954 22,4V16C22,17.1046 21.1046,18 20,18H8C6.8954,18 6,17.1046 6,16V4ZM15,6H13V9H10V11H13V14H15V11H18V9H15V6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M2,6H4V20H18V22H4C2.8954,22 2,21.1046 2,20V6Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,4H20V20H21V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4,13C4.5523,13 5,12.5523 5,12C5,11.4477 4.5523,11 4,11C3.4477,11 3,11.4477 3,12C3,12.5523 3.4477,13 4,13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,12C9,12.5523 8.5523,13 8,13C7.4477,13 7,12.5523 7,12C7,11.4477 7.4477,11 8,11C8.5523,11 9,11.4477 9,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,13C12.5523,13 13,12.5523 13,12C13,11.4477 12.5523,11 12,11C11.4477,11 11,11.4477 11,12C11,12.5523 11.4477,13 12,13Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,17C13.6569,17 15,18.3431 15,20C15,21.6569 13.6569,23 12,23C10.3431,23 9,21.6569 9,20C9,18.3431 10.3431,17 12,17Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M17,6C17,3.2386 14.7614,1 12,1C9.2386,1 7,3.2386 7,6C7,8.7614 9.2386,11 12,11C14.7614,11 17,8.7614 17,6ZM15,6C15,4.3432 13.6569,3 12,3C10.3431,3 9,4.3432 9,6C9,7.6568 10.3431,9 12,9C13.6569,9 15,7.6568 15,6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,16L12,16A1,1 0,0 0,13 15L13,13A1,1 0,0 0,12 12L12,12A1,1 0,0 0,11 13L11,15A1,1 0,0 0,12 16z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,7C13.6569,7 15,5.6568 15,4C15,2.3431 13.6569,1 12,1C10.3431,1 9,2.3431 9,4C9,5.6568 10.3431,7 12,7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M17,18C17,20.7614 14.7614,23 12,23C9.2386,23 7,20.7614 7,18C7,15.2386 9.2386,13 12,13C14.7614,13 17,15.2386 17,18ZM15,18C15,19.6569 13.6569,21 12,21C10.3431,21 9,19.6569 9,18C9,16.3431 10.3431,15 12,15C13.6569,15 15,16.3431 15,18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,8L12,8A1,1 0,0 1,13 9L13,11A1,1 0,0 1,12 12L12,12A1,1 0,0 1,11 11L11,9A1,1 0,0 1,12 8z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.5,4L21.7731,17.6262C21.9215,17.8707 22,18.1512 22,18.4373C22,19.3003 21.3003,20 20.4373,20H3.5627C2.6997,20 2,19.3003 2,18.4373C2,18.1512 2.0785,17.8707 2.2269,17.6262L10.5,4C11.25,3 12.75,3 13.5,4ZM11,8H13V14H11V8ZM11,16H13V18H11V16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,11L7.7575,7.9701C7.9,7.4 8.4123,7 9,7H15C15.5877,7 16.1,7.4 16.2425,7.9701L17,11V16.25C17,16.6642 16.6642,17 16.25,17C15.8358,17 15.5,16.6642 15.5,16.25V16H8.5V16.25C8.5,16.6642 8.1642,17 7.75,17C7.3358,17 7,16.6642 7,16.25V11ZM8.7276,8.2127C8.7589,8.0877 8.8712,8 9,8H15C15.1288,8 15.2411,8.0877 15.2724,8.2127L15.9692,11H8.0308L8.7276,8.2127ZM9,14C9.5523,14 10,13.5523 10,13C10,12.4477 9.5523,12 9,12C8.4477,12 8,12.4477 8,13C8,13.5523 8.4477,14 9,14ZM15,14C15.5523,14 16,13.5523 16,13C16,12.4477 15.5523,12 15,12C14.4477,12 14,12.4477 14,13C14,13.5523 14.4477,14 15,14Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,20H11V4H9L2,11V20Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="0"
+          android:startX="1.5"
+          android:endY="21"
+          android:endX="1.5"
+          android:type="linear">
+        <item android:offset="0" android:color="#7FFFFFFF"/>
+        <item android:offset="1" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M17,7.9142L14.7071,10.2071L13.2929,8.7929L18,4.0858L22.7071,8.7929L21.2929,10.2071L19,7.9142L19,20L17,20L17,7.9142Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,4V20H7V18L21,4H23Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="20"
+          android:startX="23"
+          android:endY="4"
+          android:endX="23"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#66FFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M8.5858,4H5V2H12V9H10V5.4142L3.7071,11.7071L2.2929,10.2929L8.5858,4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,7L2,17H16L9,7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,17H18L13,9.8571L15,7L22,17Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M5.5,4H4.5L0,13.0001V14H10.5L5.5,4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,14H11.5L8.5,8L10.5,4H11.5L16,13.0001V14Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,4V20H7V18L21,4H23Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="20"
+          android:startX="23"
+          android:endY="4"
+          android:endX="23"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#66FFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M5.7071,9.7071H9.2929V11.7071H2.2929V4.7071H4.2929V8.2929L10.5858,2L12,3.4142L5.7071,9.7071Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M7,12V4H6L0,11V12H7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,12V4H10L16,11V12H9Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M14,2H8V4H14V2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,12H2V14H8V12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4,8H2L5,11L8,8H10V12H12V8H14L11,5L8,8H6V4H4V8Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,3H3V21H21V19H5V3Z"
+      android:fillColor="#727272"/>
+  <path
+      android:pathData="M19,17C19,10.3726 13.6274,5 7,5V17H19Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="8"
+          android:startX="16"
+          android:endY="21"
+          android:endX="3"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF727272"/>
+        <item android:offset="1" android:color="#00727272"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,9H13L13.3044,10.2175C13.4581,10.2705 13.6076,10.3326 13.7521,10.4031L14.8284,9.7574L16.2426,11.1716L15.5969,12.2478C15.6674,12.3924 15.7295,12.5419 15.7825,12.6956L17,13V15L15.7825,15.3044C15.7295,15.4581 15.6674,15.6076 15.5969,15.7522L16.2426,16.8284L14.8284,18.2426L13.7521,17.5969C13.6075,17.6674 13.4581,17.7295 13.3044,17.7825L13,19H11L10.6956,17.7825C10.5419,17.7295 10.3925,17.6674 10.2479,17.5969L9.1716,18.2427L7.7574,16.8285L8.4032,15.7521C8.3326,15.6075 8.2705,15.4581 8.2175,15.3044L7,15V13L8.2175,12.6956C8.2705,12.5419 8.3326,12.3925 8.4032,12.2479L7.7574,11.1716L9.1716,9.7574L10.2479,10.4032C10.3925,10.3326 10.5419,10.2705 10.6956,10.2175L11,9ZM12,16C13.1046,16 14,15.1046 14,14C14,12.8954 13.1046,12 12,12C10.8955,12 10,12.8954 10,14C10,15.1046 10.8955,16 12,16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3.3167,6.3666C3.1084,6.7831 3,7.2425 3,7.7082V20C3,21.1046 3.8954,22 5,22H19C20.1046,22 21,21.1046 21,20V7.7082C21,7.2425 20.8916,6.7831 20.6833,6.3666L19.4472,3.8944C19.1731,3.3463 18.6129,3 18,3H6C5.3871,3 4.8269,3.3463 4.5528,3.8944L3.3167,6.3666ZM5,20H19V8H5L5,20Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3C7.03,3 3,7.03 3,12C3,16.97 7.03,21 12,21C12.83,21 13.5,20.33 13.5,19.5C13.5,19.11 13.35,18.76 13.11,18.49C12.88,18.23 12.73,17.88 12.73,17.5C12.73,16.67 13.4,16 14.23,16H16C18.76,16 21,13.76 21,11C21,6.58 16.97,3 12,3ZM6.5,12C5.67,12 5,11.33 5,10.5C5,9.67 5.67,9 6.5,9C7.33,9 8,9.67 8,10.5C8,11.33 7.33,12 6.5,12ZM9.5,8C8.67,8 8,7.33 8,6.5C8,5.67 8.67,5 9.5,5C10.33,5 11,5.67 11,6.5C11,7.33 10.33,8 9.5,8ZM14.5,8C13.67,8 13,7.33 13,6.5C13,5.67 13.67,5 14.5,5C15.33,5 16,5.67 16,6.5C16,7.33 15.33,8 14.5,8ZM17.5,12C16.67,12 16,11.33 16,10.5C16,9.67 16.67,9 17.5,9C18.33,9 19,9.67 19,10.5C19,11.33 18.33,12 17.5,12Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.2929,10.7071L7.7071,9.2929L12,13.5858L16.2929,9.2929L17.7071,10.7071L12,16.4142L6.2929,10.7071Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,10H17L12,15L7,10Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,14H17L12,9L7,14Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M10.7071,4.2929C10.3166,3.9024 9.6834,3.9024 9.2929,4.2929C8.9024,4.6834 8.9024,5.3166 9.2929,5.7071L10.5858,7H3C2.4477,7 2,7.4477 2,8C2,8.5523 2.4477,9 3,9H10.5858L9.2929,10.2929C8.9024,10.6834 8.9024,11.3166 9.2929,11.7071C9.6834,12.0976 10.3166,12.0976 10.7071,11.7071L13.7065,8.7077C13.7089,8.7053 13.7113,8.7029 13.7136,8.7006C13.8901,8.5208 13.9992,8.2746 14,8.003C14,8.002 14,8.001 14,8C14,7.999 14,7.998 14,7.997C13.9996,7.8625 13.9727,7.7343 13.9241,7.6172C13.8757,7.5001 13.804,7.3904 13.7092,7.295"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10.7071,4.2929L13.7068,7.2926Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.2929,14.2929L7.7071,15.7071L12,11.4142L16.2929,15.7071L17.7071,14.2929L12,8.5858L6.2929,14.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.6828,19.0971L20.2929,21.7071L21.7071,20.2929L3.7071,2.2929L2.2929,3.7071L6.5858,8H2V10H4V12H5L6,10H8.5858L10.5858,12H7.5L6,21H11V12.4142L13,14.4142V21H18L17.6828,19.0971Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16.5,12L16.7172,13.303L15.4142,12H16.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,10H13.4142L11.4142,8H22V10H20V12H19L18,10Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8.6306,5.2164L9.4142,6H11V3H9L8.6306,5.2164Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M15,3L15.5,6H13V3H15Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M0.3179,11.114C0.1124,11.3636 0,11.6768 0,12C0,12.3232 0.1124,12.6364 0.3179,12.886L6.4,20.2714C6.7799,20.7327 7.3462,21 7.9439,21H22C23.1046,21 24,20.1046 24,19V5C24,3.8954 23.1046,3 22,3H7.9439C7.3462,3 6.7799,3.2673 6.4,3.7286L0.3179,11.114ZM12.7071,8.2929C12.3166,7.9024 11.6834,7.9024 11.2929,8.2929C10.9024,8.6834 10.9024,9.3166 11.2929,9.7071L13.5858,12L11.2929,14.2929C10.9024,14.6834 10.9024,15.3166 11.2929,15.7071C11.6834,16.0976 12.3166,16.0976 12.7071,15.7071L15,13.4142L17.2929,15.7071C17.6834,16.0976 18.3166,16.0976 18.7071,15.7071C19.0976,15.3166 19.0976,14.6834 18.7071,14.2929L16.4142,12L18.7071,9.7071C19.0976,9.3166 19.0976,8.6834 18.7071,8.2929C18.3166,7.9024 17.6834,7.9024 17.2929,8.2929L15,10.5858L12.7071,8.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.1791,12L7.9439,19H22V5H7.9439L2.1791,12ZM0.3179,11.114C0.1124,11.3636 0,11.6768 0,12C0,12.3232 0.1124,12.6364 0.3179,12.886L6.4,20.2714C6.7799,20.7327 7.3462,21 7.9439,21H22C23.1046,21 24,20.1046 24,19V5C24,3.8954 23.1046,3 22,3H7.9439C7.3462,3 6.7799,3.2673 6.4,3.7286L0.3179,11.114Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M11.2929,8.2929C11.6834,7.9024 12.3166,7.9024 12.7071,8.2929L15,10.5858L17.2929,8.2929C17.6834,7.9024 18.3166,7.9024 18.7071,8.2929C19.0976,8.6834 19.0976,9.3166 18.7071,9.7071L16.4142,12L18.7071,14.2929C19.0976,14.6834 19.0976,15.3166 18.7071,15.7071C18.3166,16.0976 17.6834,16.0976 17.2929,15.7071L15,13.4142L12.7071,15.7071C12.3166,16.0976 11.6834,16.0976 11.2929,15.7071C10.9024,15.3166 10.9024,14.6834 11.2929,14.2929L13.5858,12L11.2929,9.7071C10.9024,9.3166 10.9024,8.6834 11.2929,8.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,9H13V15H19V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M7,6C5.8954,6 5,6.8954 5,8V9H4C2.8954,9 2,9.8954 2,11V13C2,14.1046 2.8954,15 4,15H5V16C5,17.1046 5.8954,18 7,18H20C21.1046,18 22,17.1046 22,16V8C22,6.8954 21.1046,6 20,6H7ZM7,11V8L20,8V16H7V13H4V11H7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,12L10.25,13.75L12,19L13.75,13.75L19,12L13.75,10.25L12,5L10.25,10.25L5,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9,8L7,7L8,9H9V8Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M15,9V8L17,7L16,9H15Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M9,15H8L7,17L9,16V15Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M15,15V16L17,17L16,15H15Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,9.4142L5.1716,10.8284L6.5858,8L5.1716,5.1715L8,6.5858L10.8284,5.1716L9.4142,8L10.8284,10.8284L8,9.4142Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,8L7,9L8,12L9,9L12,8L9,7L8,4L7,7L4,8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M15,8C15,11.866 11.866,15 8,15C4.134,15 1,11.866 1,8C1,4.134 4.134,1 8,1C11.866,1 15,4.134 15,8ZM13,8C13,10.7614 10.7614,13 8,13C5.2386,13 3,10.7614 3,8C3,5.2386 5.2386,3 8,3C10.7614,3 13,5.2386 13,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M40,18.3651L24,9.5651L8,18.3651L24,29L40,18.3651ZM24,5L6.0723,14.8602C4.7941,15.5632 4,16.9063 4,18.3651V39C4,41.2091 5.7909,43 8,43H40C42.2091,43 44,41.2091 44,39V18.3651C44,16.9063 43.2059,15.5632 41.9277,14.8602L24,5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M10,6C7.7909,6 6,7.7909 6,10V38C6,40.2091 7.7909,42 10,42H38C40.2091,42 42,40.2091 42,38V10C42,7.7909 40.2091,6 38,6H10ZM26,14H22V34H26V14ZM18,20H14V34H18V20ZM30,26H34V34H30V26Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,9H12C12.5523,9 13,9.4477 13,10C13,10.5523 12.5523,11 12,11H11V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,12V15H12.5C13.3284,15 14,14.3284 14,13.5C14,12.6716 13.3284,12 12.5,12H11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM11,6H10V8H8V9H9V15H8V16H10V18H11V16H12V18H13V16H13.5C14.8807,16 16,14.8807 16,13.5C16,12.502 15.4152,11.6405 14.5695,11.2397C14.8391,10.8989 15,10.4682 15,10C15,8.8954 14.1046,8 13,8V6H12V8H11V6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,3H5V21H15V17H17V21H19V3ZM17,5H15V7H17V5ZM7,9H9V11H7V9ZM11,9H13V11H11V9ZM9,13H7V15H9V13ZM11,13H13V15H11V13ZM9,17H7V19H9V17ZM11,17H13V19H11V17ZM17,13H15V15H17V13ZM15,9H17V11H15V9ZM11,5H13V7H11V5ZM9,5H7V7H9V5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1,2V4H2V22H10V20H12V22H14V4H15V2H1ZM4,4H6V6H4V4ZM12,4H8V6H12V4ZM12,12H8V14H12V12ZM6,12H4V14H6V12ZM4,8H6V10H4V8ZM6,16H4V18H6V16ZM12,8H8V10H12V8ZM8,16H12V18H8V16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22,8H14V10H16V12H14V14H16V16H14V18H16V20H14V22H22V8ZM20,10H18V12H20V10ZM20,14H18V16H20V14ZM20,18H18V20H20V18Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M10,20h2v2h-2z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,3L9,6V8H3V22H21V12H15V6L12,3ZM11,8V6H13V8H11ZM11,12V10H13V12H11ZM13,16V14H11V16H13ZM11,20V18H13V20H11ZM17,14H19V16H17V14ZM17,18H19V20H17V18ZM5,10H7V12H5V10ZM5,14H7V16H5V14ZM7,18H5V20H7V18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.01,15.38C18.78,15.38 17.59,15.18 16.48,14.82C16.13,14.7 15.74,14.79 15.47,15.06L13.9,17.03C11.07,15.68 8.42,13.13 7.01,10.2L8.96,8.54C9.23,8.26 9.31,7.87 9.2,7.52C8.83,6.41 8.64,5.22 8.64,3.99C8.64,3.45 8.19,3 7.65,3H4.19C3.65,3 3,3.24 3,3.99C3,13.28 10.73,21 20.01,21C20.72,21 21,20.37 21,19.82V16.37C21,15.83 20.55,15.38 20.01,15.38Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,5H6V13H2L7,19L12,13H8V5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,19H16V11H12L17,5L22,11H18V19Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,6h14v2h-14z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,11h14v2h-14z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M3,16h14v2h-14z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1.7071,7.2929C1.3166,6.9024 0.6834,6.9024 0.2929,7.2929C-0.0976,7.6834 -0.0976,8.3166 0.2929,8.7071L3.5858,12L0.2929,15.2929C-0.0976,15.6834 -0.0976,16.3166 0.2929,16.7071C0.6834,17.0976 1.3166,17.0976 1.7071,16.7071L5,13.4142L8.2929,16.7071C8.6834,17.0976 9.3166,17.0976 9.7071,16.7071C10.0976,16.3166 10.0976,15.6834 9.7071,15.2929L6.4142,12L9.7071,8.7071C10.0976,8.3166 10.0976,7.6834 9.7071,7.2929C9.3166,6.9024 8.6834,6.9024 8.2929,7.2929L5,10.5858L1.7071,7.2929Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M23,7H14C13.4477,7 13,7.4477 13,8C13,8.5523 13.4477,9 14,9H23C23.5523,9 24,8.5523 24,8C24,7.4477 23.5523,7 23,7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,12C13,11.4477 13.4477,11 14,11H20C20.5523,11 21,11.4477 21,12C21,12.5523 20.5523,13 20,13H14C13.4477,13 13,12.5523 13,12Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M13,16C13,15.4477 13.4477,15 14,15H17C17.5523,15 18,15.4477 18,16C18,16.5523 17.5523,17 17,17H14C13.4477,17 13,16.5523 13,16Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M8,4C5.7909,4 4,5.7909 4,8V24C4,26.2091 5.7909,28 8,28H24C26.2091,28 28,26.2091 28,24V8C28,5.7909 26.2091,4 24,4H8ZM12.4142,22.4142L16,18.8285L19.5858,22.4142L22.4142,19.5858L18.8285,16L22.4142,12.4142L19.5858,9.5858L16,13.1716L12.4142,9.5858L9.5858,12.4142L13.1716,16L9.5858,19.5858L12.4142,22.4142Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,10L12,3L8,10H16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,21V12H10L14,18V12H16V21H14L10,15V21H8Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,9H7V11H21V9Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M21,13H7V15H21V13Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M21,4H3V6H21V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M21,18H3V20H21V18Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.5351,6C9.2268,4.8044 10.5194,4 12,4C13.4806,4 14.7733,4.8044 15.4649,6H17C19.2091,6 21,7.7909 21,10C21,11.8638 19.7252,13.4299 18,13.874V17H6V13.874C4.2748,13.4299 3,11.8638 3,10C3,7.7909 4.7909,6 7,6H8.5351ZM6,20V18H18V20H6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,11H17V17H11V11ZM13,13H15V15H13V13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6,1H8V3H16V1H18V3H19C20.1046,3 21,3.8954 21,5V19C21,20.1046 20.1046,21 19,21H5C3.8954,21 3,20.1046 3,19V5C3,3.8954 3.8954,3 5,3H6V1ZM5,8H19V19H5V8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,2C2.8954,2 2,2.8954 2,4V22L6,18H20C21.1046,18 22,17.1046 22,16V4C22,2.8954 21.1046,2 20,2H4ZM18,6H6V8H18V6ZM18,9H6V11H18V9ZM6,12H14V14H6V12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,2C8.8954,2 8,2.8954 8,4V6H16C17.1046,6 18,6.8954 18,8V16H20C21.1046,16 22,15.1046 22,14V4C22,2.8954 21.1046,2 20,2H10Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,8C2.8954,8 2,8.8954 2,10V20C2,21.1046 2.8954,22 4,22H14C15.1046,22 16,21.1046 16,20V10C16,8.8954 15.1046,8 14,8H4ZM14,10H4V20H14V10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,1C5.8954,1 5,1.8954 5,3V21C5,22.1046 5.8954,23 7,23H17C18.1046,23 19,22.1046 19,21V3C19,1.8954 18.1046,1 17,1H7ZM12,8C13.1046,8 14,7.1046 14,6C14,4.8954 13.1046,4 12,4C10.8954,4 10,4.8954 10,6C10,7.1046 10.8954,8 12,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,4C4.8954,4 4,4.8954 4,6V22H6V8H18V22H20V6C20,4.8954 19.1046,4 18,4H6Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,8h12v4h-12z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.8"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,8h12v4h-12z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M6,12h12v3h-12z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.4"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,9h6v3h-6z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,9H12V12H18V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,13H12V16H18V13Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1L6,12L12,22L18,12L12,1ZM12,5.1767L8.304,11.9527L12,18.1127L15.696,11.9527L12,5.1767Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M18,12L12,1L6,12H18Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,1C11,0.4477 11.4477,0 12,0C12.5523,0 13,0.4477 13,1V3C13,3.5523 12.5523,4 12,4C11.4477,4 11,3.5523 11,3V1Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M11,21C11,20.4477 11.4477,20 12,20C12.5523,20 13,20.4477 13,21V23C13,23.5523 12.5523,24 12,24C11.4477,24 11,23.5523 11,23V21Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M12,6C11.7979,6 11.6152,6.1207 11.536,6.3067L6.0347,19.2185C6.0118,19.2723 6,19.3301 6,19.3886C6,19.6874 6.2951,19.8967 6.5771,19.798L12,17.9V6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,17.9L17.4229,19.798C17.7049,19.8967 18,19.6874 18,19.3886C18,19.3301 17.9882,19.2723 17.9653,19.2185L12.464,6.3067C12.3848,6.1207 12.2021,6 12,6V17.9Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,10L12,3L8,10H16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,21V12H10L14,18V12H16V21H14L10,15V21H8Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,19l12,-0l0,-17l-12,-0z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M4,20C4,21.1046 4.8954,22 6,22H18C19.1046,22 20,21.1046 20,20V2H18V19H6V2H4V20Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9.575,16.97L12,16L14.425,16.97C14.4746,16.9898 14.5274,17 14.5807,17C14.8123,17 15,16.8102 15,16.5787C15,16.5269 14.9905,16.4752 14.9719,16.4269L12.6795,10.4667C12.5714,10.1855 12.3012,10 12,10C11.6988,10 11.4286,10.1855 11.3205,10.4667L9.0281,16.4269C9.0095,16.4752 9,16.5269 9,16.5787C9,16.8102 9.1877,17 9.4193,17C9.4726,17 9.5254,16.9898 9.575,16.97Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,5h12v17h-12z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H18C19.1046,2 20,2.8954 20,4V22H18V5H6V22H4V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9.575,16.97L12,16L14.425,16.97C14.4746,16.9898 14.5274,17 14.5807,17C14.8123,17 15,16.8102 15,16.5787C15,16.5269 14.9905,16.4752 14.9719,16.4269L12.6795,10.4667C12.5714,10.1855 12.3012,10 12,10C11.6988,10 11.4286,10.1855 11.3205,10.4667L9.0281,16.4269C9.0095,16.4752 9,16.5269 9,16.5787C9,16.8102 9.1877,17 9.4193,17C9.4726,17 9.5254,16.9898 9.575,16.97Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.7071,6.2929C21.0976,6.6834 21.0976,7.3166 20.7071,7.7071L9,19.4142L3.2929,13.7071C2.9024,13.3166 2.9024,12.6834 3.2929,12.2929C3.6834,11.9024 4.3166,11.9024 4.7071,12.2929L9,16.5858L19.2929,6.2929C19.6834,5.9024 20.3166,5.9024 20.7071,6.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM10,12V8H14V12H17L12,17L7,12H10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.2929,9.7071L14.2929,6.7071L3,18V21H6L17.2929,9.7071Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M15.7071,5.2929L17.2929,3.7071C17.6834,3.3166 18.3166,3.3166 18.7071,3.7071L20.2929,5.2929C20.6834,5.6834 20.6834,6.3165 20.2929,6.7071L18.7071,8.2929L15.7071,5.2929Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,22H2V19L10,12L14,15L22,7V22Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,15L10,8L14,11L21.5,3.5"
+      android:strokeAlpha="0.5"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,13C12.5523,13 13,12.5523 13,12C13,11.4477 12.5523,11 12,11C11.4477,11 11,11.4477 11,12C11,12.5523 11.4477,13 12,13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM6,18L10,10L18,6L14,14L6,18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,9V17H14V9H17L12,3L7,9H10Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20,21V19H4V21H20Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,2C2.8954,2 2,2.8954 2,4V20C2,21.1046 2.8954,22 4,22H20C21.1046,22 22,21.1046 22,20V4C22,2.8954 21.1046,2 20,2H4ZM17,9L14,5L11,9L13,9V11.9996C12.1643,11.3719 11.1256,11 10,11H9L9,9L5,12L9,15V13H10C11.6569,13 13,14.3431 13,16L13,19H15V9L17,9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14,5L17,9H11L14,5Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M15,9L15,16C15,14.3642 14.2144,12.9118 13,11.9996V9H15Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.8293,7H21V9H10.8293C10.4175,10.1652 9.3062,11 8,11C6.6938,11 5.5825,10.1652 5.1707,9H3V7H5.1707C5.5825,5.8348 6.6938,5 8,5C9.3062,5 10.4175,5.8348 10.8293,7ZM9,8C9,8.5523 8.5523,9 8,9C7.4477,9 7,8.5523 7,8C7,7.4477 7.4477,7 8,7C8.5523,7 9,7.4477 9,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M18.8293,15H21V17H18.8293C18.4175,18.1652 17.3062,19 16,19C14.6938,19 13.5825,18.1652 13.1707,17H3V15H13.1707C13.5825,13.8348 14.6938,13 16,13C17.3062,13 18.4175,13.8348 18.8293,15ZM17,16C17,16.5523 16.5523,17 16,17C15.4477,17 15,16.5523 15,16C15,15.4477 15.4477,15 16,15C16.5523,15 17,15.4477 17,16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,12L20,7V4H4V6L11,13V20L14,19V12ZM12,11.1716V11.0633L18,6.0633V6H6.8284L12,11.1716Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4C2.8954,4 2,4.8954 2,6V18C2,19.1046 2.8954,20 4,20H20C21.1046,20 22,19.1046 22,18V8C22,6.8954 21.1046,6 20,6H12L10,4H4Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4C2.8954,4 2,4.8954 2,6V18C2,19.1046 2.8954,20 4,20H12V19C12,15.134 15.134,12 19,12C20.0736,12 21.0907,12.2417 22,12.6736V8C22,6.8954 21.1046,6 20,6H12L10,4H4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M24,19C24,21.7614 21.7614,24 19,24C16.2386,24 14,21.7614 14,19C14,16.2386 16.2386,14 19,14C21.7614,14 24,16.2386 24,19ZM23,19L19,16V18H16V20H19V22L23,19Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.2929,6.7071L11.5858,7H12H20C20.5523,7 21,7.4477 21,8V18C21,18.5523 20.5523,19 20,19H4C3.4477,19 3,18.5523 3,18V6C3,5.4477 3.4477,5 4,5H9.5858L11.2929,6.7071Z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,13.5858V11L16.2425,7.9701C16.1,7.4 15.5877,7 15,7H10.4142L11.4142,8H15C15.1288,8 15.2411,8.0877 15.2724,8.2127L15.9692,11H14.4142L17,13.5858Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM18.3199,16.9056C19.3729,15.551 20,13.8487 20,12C20,7.5817 16.4183,4 12,4C10.1513,4 8.449,4.6271 7.0944,5.6801L18.3199,16.9056ZM16.9056,18.3199C15.551,19.3729 13.8487,20 12,20C7.5817,20 4,16.4183 4,12C4,10.1513 4.6271,8.449 5.6801,7.0944L7.5172,8.9314L7,11V16.25C7,16.6642 7.3358,17 7.75,17C8.1642,17 8.5,16.6642 8.5,16.25V16H14.5858L16.9056,18.3199ZM8.3418,9.756L8.0308,11H9.5858L8.3418,9.756ZM9,14C9.5523,14 10,13.5523 10,13C10,12.4477 9.5523,12 9,12C8.4477,12 8,12.4477 8,13C8,13.5523 8.4477,14 9,14Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,9V14H7V12H9V11H7V10H9V9H6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10,9V14H11V12H12.5C13.3284,12 14,11.3284 14,10.5C14,9.6716 13.3284,9 12.5,9H10ZM12.5,11H11V10H12.5C12.7761,10 13,10.2239 13,10.5C13,10.7761 12.7761,11 12.5,11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15,10C15,9.4477 15.4477,9 16,9H18V10H16V11H17C17.5523,11 18,11.4477 18,12V13C18,13.5523 17.5523,14 17,14H15V13H17V12H16C15.4477,12 15,11.5523 15,11V10Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,4C2,2.8954 2.8954,2 4,2H20C21.1046,2 22,2.8954 22,4V20C22,21.1046 21.1046,22 20,22H4C2.8954,22 2,21.1046 2,20V4ZM4,4H20V20H4V4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,3C4.8954,3 4,3.8954 4,5V21H14V5C14,3.8954 13.1046,3 12,3H6ZM12,5H6V10H12V5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17.6215,7.0358L15.2929,4.7071L16,4L20,8V19C20,20.1046 19.1046,21 18,21C16.8954,21 16,20.1046 16,19V14C16,13.4477 15.5523,13 15,13H13V12H15C16.1046,12 17,12.8954 17,14V19C17,19.5523 17.4477,20 18,20C18.5523,20 19,19.5523 19,19V10.7324C18.7058,10.9026 18.3643,11 18,11C16.8954,11 16,10.1046 16,9C16,8.0248 16.6979,7.2126 17.6215,7.0358ZM18,8C18.5523,8 19,8.4477 19,9C19,9.5523 18.5523,10 18,10C17.4477,10 17,9.5523 17,9C17,8.4477 17.4477,8 18,8Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.71,11.29L12.71,2.29C12.32,1.9 11.69,1.9 11.3,2.29L2.3,11.29C1.91,11.68 1.91,12.31 2.3,12.7L11.3,21.7C11.69,22.09 12.32,22.09 12.71,21.7L21.71,12.7C22.1,12.32 22.1,11.69 21.71,11.29ZM14,14.5V12H10V15H8V11C8,10.45 8.45,10 9,10H14V7.5L17.5,11L14,14.5Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,2H13V4.0619C16.6187,4.5131 19.4869,7.3813 19.9381,11H22V13H19.9381C19.4869,16.6187 16.6187,19.4869 13,19.9381V22H11V19.9381C7.3813,19.4869 4.5131,16.6187 4.0619,13H2V11H4.0619C4.5131,7.3813 7.3813,4.5131 11,4.0619V2ZM12,6C12.3407,6 12.6748,6.0284 13,6.083C15.5125,6.5045 17.4955,8.4875 17.917,11C17.9716,11.3252 18,11.6593 18,12C18,12.3407 17.9716,12.6748 17.917,13C17.4955,15.5125 15.5125,17.4955 13,17.917C12.6748,17.9716 12.3407,18 12,18C11.6593,18 11.3252,17.9716 11,17.917C8.4875,17.4955 6.5045,15.5125 6.083,13C6.0284,12.6748 6,12.3407 6,12C6,11.6593 6.0284,11.3252 6.083,11C6.5045,8.4875 8.4875,6.5045 11,6.083C11.3252,6.0284 11.6593,6 12,6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.8293,5C17.9398,4.6872 18,4.3506 18,4C18,2.3431 16.6569,1 15,1C13.3431,1 12,2.3431 12,4C12,2.3431 10.6569,1 9,1C7.3432,1 6,2.3431 6,4C6,4.3506 6.0602,4.6872 6.1707,5H4C2.8954,5 2,5.8954 2,7V21C2,22.1046 2.8954,23 4,23H20C21.1046,23 22,22.1046 22,21V7C22,5.8954 21.1046,5 20,5H17.8293ZM10,5V4C10,3.4477 9.5523,3 9,3C8.4477,3 8,3.4477 8,4C8,4.5523 8.4477,5 9,5H10ZM14,5H15C15.5523,5 16,4.5523 16,4C16,3.4477 15.5523,3 15,3C14.4477,3 14,3.4477 14,4V5ZM14.4142,7L16.7071,9.2929L15.2929,10.7071L12,7.4142L8.7071,10.7071L7.2929,9.2929L9.5858,7H4V21H20V7H14.4142Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,9C19,14 12,22 12,22C12,22 5,14 5,9C5,5 8.134,2 12,2C15.866,2 19,5 19,9ZM11,8V6H13V8H15V10H13V12H11V10H9V8H11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.4367,18.4071C16.6712,17.1726 15.4997,13.9998 12.8203,11.3203C10.1409,8.6409 6.968,7.4695 5.7336,8.7039C4.4992,9.9384 5.6706,13.1112 8.35,15.7906C11.0295,18.4701 14.2023,19.6415 15.4367,18.4071Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,2V4C16.4183,4 20,7.5817 20,12H22C22,6.4771 17.5228,2 12,2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,12C18,8.6863 15.3137,6 12,6V8C14.2091,8 16,9.7909 16,12H18Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3.2512,8.5C5.5743,6.3872 8.8608,6.8848 11.8713,9.1377C11.5472,9.2876 11.2856,9.5497 11.1364,9.8742C8.9249,8.2626 6.7157,7.7218 5.7336,8.7039C4.4992,9.9384 5.6706,13.1112 8.35,15.7906C11.0295,18.4701 14.2023,19.6415 15.4367,18.4071C16.4416,17.4022 15.8522,15.1129 14.153,12.8508C14.4725,12.6961 14.7287,12.4313 14.8726,12.1058C17.2204,15.1247 17.9103,18.4162 15.5388,20.7876C13.2767,23.0497 8.6923,22.1328 5.2991,18.7397C1.906,15.3466 0.9891,10.7621 3.2512,8.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12.5,15C12.2239,15 12,14.7761 12,14.5V12H9.5C9.2239,12 9,11.7761 9,11.5C9,11.2239 9.2239,11 9.5,11H12V10.5C12,10.2239 12.2239,10 12.5,10C12.7761,10 13,10.2239 13,10.5V11H13.5C13.7761,11 14,11.2239 14,11.5C14,11.7761 13.7761,12 13.5,12H13V14.5C13,14.7761 12.7761,15 12.5,15Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,12C2,9.7909 3.7909,8 6,8H18C20.2091,8 22,9.7909 22,12V12C22,14.2091 20.2091,16 18,16H6C3.7909,16 2,14.2091 2,12V12Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,12C2,10.8954 2.8954,10 4,10H20C21.1046,10 22,10.8954 22,12V12C22,13.1046 21.1046,14 20,14H4C2.8954,14 2,13.1046 2,12V12Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,12C2,11.4477 2.4477,11 3,11H21C21.5523,11 22,11.4477 22,12V12C22,12.5523 21.5523,13 21,13H3C2.4477,13 2,12.5523 2,12V12Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M13.8787,16L6.9393,9.0606L9.0606,6.9393L16,13.8787L22.9393,6.9393L25.0606,9.0606L18.1213,16L25.0606,22.9393L22.9393,25.0606L16,18.1213L9.0606,25.0606L6.9393,22.9393L13.8787,16Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12C13.6569,12 15,10.6569 15,9C15,7.3432 13.6569,6 12,6C10.3431,6 9,7.3432 9,9C9,10.6569 10.3431,12 12,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,17.5C18,16 15.5,14 12,14C8.5,14 6,16 6,17.5V19H18V17.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5.5,11C6.8807,11 8,9.8807 8,8.5C8,7.1193 6.8807,6 5.5,6C4.1193,6 3,7.1193 3,8.5C3,9.8807 4.1193,11 5.5,11Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M7.1023,13.2085C6.6119,13.0765 6.0739,13 5.5,13C2.875,13 1,14.6 1,15.8V17H4.0357C4.2559,15.4632 5.4582,14.2478 6.601,13.5084C6.7618,13.4043 6.9291,13.3042 7.1023,13.2085Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M19.9643,17C19.7441,15.4632 18.5418,14.2478 17.399,13.5084C17.2382,13.4043 17.0709,13.3042 16.8977,13.2085C17.3881,13.0765 17.9261,13 18.5,13C21.125,13 23,14.6 23,15.8V17H19.9643Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M18.5,11C19.8807,11 21,9.8807 21,8.5C21,7.1193 19.8807,6 18.5,6C17.1193,6 16,7.1193 16,8.5C16,9.8807 17.1193,11 18.5,11Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M1,13V3C1,2.4477 1.4477,2 2,2H6L8,4H14C14.5523,4 15,4.4477 15,5V13C15,13.5523 14.5523,14 14,14H2C1.4477,14 1,13.5523 1,13Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,2C4.8954,2 4,2.8954 4,4V14H20V6C20,4.8954 19.1046,4 18,4H12L10.4,2H6Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M5,4C3.8954,4 3,4.8954 3,6V18H21V8C21,6.8954 20.1046,6 19,6H12L10,4H5Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,7C2.8954,7 2,7.8954 2,9V21C2,22.1046 2.8954,23 4,23H20C21.1046,23 22,22.1046 22,21V11C22,9.8954 21.1046,9 20,9H12L10,7H4Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,2L12,6L18,2H6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10,8V11H14V8H16V16H14V13H10L10,16H8V8H10Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,18L6,22H18L12,18Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM9.5001,8.5C10.4487,8.8162 10.4484,8.8173 10.4484,8.8173L10.448,8.8184L10.4473,8.8204L10.4461,8.8241L10.444,8.83L10.4415,8.8369L10.4448,8.829C10.4504,8.8158 10.463,8.788 10.4839,8.7503C10.5262,8.674 10.5979,8.5652 10.7071,8.4556C10.9064,8.2555 11.2784,8 11.9877,8C12.7107,8 13.0299,8.2511 13.1997,8.4766C13.4057,8.7502 13.5001,9.1397 13.5001,9.5C13.5001,10.003 13.2099,10.3579 12.7356,10.6425C12.5033,10.7819 12.2623,10.8793 12.0745,10.9419C11.9823,10.9727 11.9073,10.9936 11.8585,11.0061C11.8341,11.0124 11.8166,11.0165 11.8071,11.0186L11.7998,11.0203L11.0001,11.1802V15H13.0001V12.7325C13.2306,12.6413 13.4956,12.5189 13.7646,12.3575C14.5402,11.8921 15.5001,10.997 15.5001,9.5C15.5001,8.8603 15.3444,7.9998 14.7973,7.2734C14.214,6.4989 13.2771,6 11.9877,6C10.7093,6 9.8375,6.4945 9.2899,7.0444C9.0257,7.3098 8.8481,7.576 8.7346,7.7809C8.6775,7.8839 8.6355,7.9732 8.6061,8.0421C8.5913,8.0766 8.5796,8.1062 8.5706,8.13C8.5661,8.1419 8.5623,8.1524 8.5591,8.1614L8.5548,8.1737L8.553,8.1791L8.5521,8.1815L8.5518,8.1826C8.5518,8.1826 8.5514,8.1838 9.5001,8.5ZM12.0001,18C12.5524,18 13.0001,17.5523 13.0001,17C13.0001,16.4477 12.5524,16 12.0001,16C11.4478,16 11.0001,16.4477 11.0001,17C11.0001,17.5523 11.4478,18 12.0001,18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.5079,17.078L2.293,20.2928L3.7072,21.7071L21.7072,3.7071L20.293,2.2929L16.6195,5.9663C15.2308,5.3815 13.6808,5 12,5C4.8,5 0,12 0,12C0,12 2.061,15.0057 5.5079,17.078ZM7.8284,14.7574L9.2924,13.2934C9.105,12.9018 9,12.4632 9,12C9,10.3431 10.3431,9 12,9C12.4632,9 12.9018,9.105 13.2934,9.2924L14.7574,7.8284C13.967,7.3049 13.0191,7 12,7C9.2386,7 7,9.2386 7,12C7,13.0191 7.3049,13.967 7.8284,14.7574Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,19C11.0497,19 10.1411,18.878 9.2799,18.6663L11.0751,16.9146C11.3748,16.9707 11.684,17 12,17C14.7614,17 17,14.7614 17,12C17,11.6366 16.9612,11.2822 16.8876,10.9408L19.9341,7.8943C22.5058,9.8209 24,12 24,12C24,12 19.2,19 12,19Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,5L10.25,10L13.1,13.8L11.5,15C9.81,12.75 7,9 7,9L1,17H23L14,5Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,12C19,15.866 15.866,19 12,19C10.2665,19 8.6802,18.3699 7.4577,17.3262L6.0856,18.784C7.6673,20.1641 9.736,21 12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12H0L4,17L8,12H5C5,8.134 8.134,5 12,5C15.866,5 19,8.134 19,12ZM11,9V13V13.5352L11.4453,13.8321L14.4453,15.8321L15.5547,14.1679L13,12.4648V9H11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M28.5,18C28.5,23.799 23.799,28.5 18,28.5C15.3998,28.5 13.0204,27.5549 11.1865,25.9894L9.1285,28.176C11.501,30.2461 14.604,31.5 18,31.5C25.4558,31.5 31.5,25.4558 31.5,18C31.5,10.5442 25.4558,4.5 18,4.5C10.5442,4.5 4.5,10.5442 4.5,18H0L6,25.5L12,18H7.5C7.5,12.201 12.201,7.5 18,7.5C23.799,7.5 28.5,12.201 28.5,18Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16.5,13.5V20.3028L21.668,23.7481L23.332,21.2519L19.5,18.6972V13.5H16.5Z"
+      android:fillColor="#ffffff"/>
+</vector>
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">
   <path
-      android:pathData="M14,3H10V11H7L12,17L17,11H14V3ZM20,21V19H4V21H20Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
+      android:pathData="M10,3H14V11H17L12,17L7,11H10V3Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20,21V19H4V21H20Z"
+      android:fillColor="#ffffff"/>
 </vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,2H5V22H7V14H19L16,8L19,2Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,14H7V22H5V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,2H19L16,8L19,14H5V2Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M16,8L19,2H5V14H19L16,8ZM15.7639,12L13.7639,8L15.7639,4H7V12H15.7639Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,14H4V22H2V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,2H16L13,8L14.5,11L14,14H12H2V2Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M13,8L13.2437,8.4875C12.6102,8.72 12.0142,9.0304 11.4674,9.407L10.7639,8L12.7639,4H4V12H9.0703C8.7122,12.619 8.4347,13.2905 8.252,14H2V2H16L13,8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,22C19.3137,22 22,19.3137 22,16C22,12.6863 19.3137,10 16,10C12.6863,10 10,12.6863 10,16C10,19.3137 12.6863,22 16,22ZM17,13C17,12.4477 16.5523,12 16,12C15.4477,12 15,12.4477 15,13V16.5C15,17.0523 15.4477,17.5 16,17.5H19C19.5523,17.5 20,17.0523 20,16.5C20,15.9477 19.5523,15.5 19,15.5H17V13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M24,8L22.4348,9.8261C22.2967,9.72 22.1515,9.6228 22,9.5351V8H16V9.5351C14.8044,10.2267 14,11.5194 14,13V19C14,19.2082 14.0159,19.4127 14.0466,19.6123L12,22L0,8C0,8 3,3 12,3C21,3 24,8 24,8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20,10V11C21.1046,11 22,11.8954 22,13V14H20V13H18V15H20C21.1046,15 22,15.8954 22,17V19C22,20.1046 21.1046,21 20,21V22H18V21C16.8954,21 16,20.1046 16,19V18H18V19H20V17H18C16.8954,17 16,16.1046 16,15V13C16,11.8954 16.8954,11 18,11V10H20Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,2H11V22H18V2ZM15,21H14V17H15V21ZM15,14H14V10H15V14ZM15,7H14V3H15V7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11,13H2V15H3L3,16H2V18H11V13ZM8,16V15L5,15L5,16H8Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M18,18H22V16L21,16V15H22V13H18V15H19V16H18V18Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,5.5858L8.5858,9H2V11H9.4142L12,8.4142L14.5858,11H22V9H15.4142L12,5.5858Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,18.4142L8.5858,15H2V13H9.4142L12,15.5858L14.5858,13H22V15H15.4142L12,18.4142Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,5C2.8954,5 2,5.8954 2,7V17C2,18.1046 2.8954,19 4,19H20C21.1046,19 22,18.1046 22,17V7C22,5.8954 21.1046,5 20,5H4ZM7,8H5V10H7V8ZM7,11H5V13H7V11ZM8,15H16V17H8V15ZM10,8H8V10H10V8ZM8,11H10V13H8V11ZM13,8H11V10H13V8ZM11,11H13V13H11V11ZM16,8H14V10H16V8ZM14,11H16V13H14V11ZM19,8H17V10H19V8ZM17,11H19V13H17V11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,2C2.8954,2 2,2.8954 2,4V14C2,15.1046 2.8954,16 4,16H20C21.1046,16 22,15.1046 22,14V4C22,2.8954 21.1046,2 20,2H4ZM7,5H5V7H7V5ZM7,8H5V10H7V8ZM8,12H16V14H8V12ZM10,5H8V7H10V5ZM8,8H10V10H8V8ZM13,5H11V7H13V5ZM11,8H13V10H11V8ZM16,5H14V7H16V5ZM14,8H16V10H14V8ZM19,5H17V7H19V5ZM17,8H19V10H17V8Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M9,19H15L12,22L9,19Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,2V12L11.4142,21.4142C11.7893,21.7893 12.298,22 12.8284,22H13.1716C13.702,22 14.2107,21.7893 14.5858,21.4142L21.4142,14.5858C21.7893,14.2107 22,13.702 22,13.1716V12.8284C22,12.298 21.7893,11.7893 21.4142,11.4142L12,2H2ZM5.5,7C6.3284,7 7,6.3284 7,5.5C7,4.6716 6.3284,4 5.5,4C4.6716,4 4,4.6716 4,5.5C4,6.3284 4.6716,7 5.5,7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,6C2,4.8954 2.8954,4 4,4H20C21.1046,4 22,4.8954 22,6V18C22,19.1046 21.1046,20 20,20H4C2.8954,20 2,19.1046 2,18V6Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M8,7L11,11H9V17H7V11H5L8,7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,7L19,11H17V17H15V11H13L16,7Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,13C12.5523,13 13,12.5523 13,12C13,11.4477 12.5523,11 12,11C11.4477,11 11,11.4477 11,12C11,12.5523 11.4477,13 12,13ZM12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,7h14v2h-14z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19,12H9V14H19V12Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M19,16H9V18H19V16Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,5H19V7H5V5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,11H15V13H5V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,17H5V19H12V17Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000000"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:strokeAlpha="0.05"
+      android:fillColor="#000000"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,12m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#5E78FE"/>
+  <path
+      android:pathData="M12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17ZM12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.1"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
+      android:strokeAlpha="0.1"
+      android:fillColor="#000000"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:strokeAlpha="0.05"
+      android:fillColor="#000000"
+      android:fillAlpha="0.05"/>
+  <path
+      android:pathData="M12,12m-7,0a7,7 0,1 1,14 0a7,7 0,1 1,-14 0"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,12m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
+      android:fillColor="#999999"/>
+  <path
+      android:pathData="M12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17ZM12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.1"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,9C19,10.5116 18.3603,12.2973 17.4676,14.0533L14.3184,10.9041C14.7443,10.3862 15,9.7229 15,9C15,7.3432 13.6569,6 12,6C11.2771,6 10.6138,6.2557 10.0959,6.6817L7.2369,3.8227C8.4862,2.6794 10.1602,2 12,2C15.866,2 19,5 19,9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5.3482,6.7624L2.2929,3.7071L3.7071,2.2929L21.7071,20.2929L20.2929,21.7071L15.6834,17.0976C13.8745,19.8578 12,22 12,22C12,22 5,14 5,9C5,8.21 5.1223,7.459 5.3482,6.7624Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="0.3"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M9,8.5C9,8.2239 9.2239,8 9.5,8C9.7761,8 10,8.2239 10,8.5V10.5C10,10.7761 9.7761,11 9.5,11C9.2239,11 9,10.7761 9,10.5V8.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,8.5C14,8.2239 14.2239,8 14.5,8C14.7761,8 15,8.2239 15,8.5V10.5C15,10.7761 14.7761,11 14.5,11C14.2239,11 14,10.7761 14,10.5V8.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6.3419,12.5257C6.6039,12.4383 6.887,12.5799 6.9743,12.8419L7.2094,13.5472C7.8968,15.6092 9.8265,17 12,17C14.1735,17 16.1032,15.6092 16.7906,13.5472L17.0257,12.8419C17.113,12.5799 17.3961,12.4383 17.6581,12.5257C17.9201,12.613 18.0617,12.8961 17.9743,13.1581L17.7393,13.8634C16.9158,16.3337 14.604,18 12,18C9.396,18 7.0842,16.3337 6.2607,13.8634L6.0257,13.1581C5.9383,12.8961 6.0799,12.613 6.3419,12.5257Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13.7966,21.8391C18.462,20.9927 22,16.9095 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,16.9095 5.538,20.9927 10.2034,21.8391L11.2428,23.5713C11.4023,23.8372 11.6898,24 12,24C12.3102,24 12.5977,23.8372 12.7572,23.5713L13.7966,21.8391ZM20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,2H11V5H13V2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,19V22H13V19H11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,13H19V11H22V13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,13V11H2V13H5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17ZM12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M18.364,4.2218L19.7782,5.636L17.6569,7.7573L16.2426,6.3431L18.364,4.2218Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6.3432,16.2426L7.7574,17.6568L5.636,19.7782L4.2218,18.3639L6.3432,16.2426Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18.364,19.7782L19.7782,18.3639L17.6569,16.2426L16.2426,17.6568L18.364,19.7782Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M7.7574,6.3431L6.3432,7.7573L4.2218,5.636L5.636,4.2218L7.7574,6.3431Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V5.99H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07ZM18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10ZM15.88,17L17.5,12.67L19.12,17H15.88V17Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,12C3,10.7194 3.5087,9.4913 4.4142,8.5858L4.5383,8.4617C5.4914,7.5086 6.7053,6.8589 8.0271,6.5946L10.6466,6.0707C10.8816,6.0237 11.1207,6 11.3604,6C13.3705,6 15,7.6295 15,9.6396V14.3604C15,16.3705 13.3705,18 11.3604,18C11.1207,18 10.8816,17.9763 10.6466,17.9293L8.0271,17.4054C6.7053,17.1411 5.4914,16.4914 4.5383,15.5383L4.4142,15.4142C3.5087,14.5087 3,13.2806 3,12ZM5.8284,10L5.9525,9.8759C6.6264,9.202 7.4847,8.7427 8.4193,8.5557L11.0388,8.0318C11.1447,8.0107 11.2524,8 11.3604,8C12.2659,8 13,8.7341 13,9.6396V14.3604C13,15.2659 12.2659,16 11.3604,16C11.2524,16 11.1447,15.9893 11.0388,15.9682L8.4193,15.4443C7.4847,15.2573 6.6264,14.798 5.9525,14.124L5.8284,14C5.298,13.4696 5,12.7501 5,12C5,11.2499 5.298,10.5304 5.8284,10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.9374,8.7965C16.8354,8.1159 16.6118,7.4751 16.2894,6.8969L19.7575,6.0299L20.2425,7.9702L16.9374,8.7965Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M17,11V13H21V11H17Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16.9374,15.2036C16.8354,15.8842 16.6117,16.525 16.2893,17.1032L19.7575,17.9702L20.2425,16.0299L16.9374,15.2036Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,9V6H11V9H14V11H11V14H9V11H6V9H9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16.3199,14.9056C17.3729,13.551 18,11.8487 18,10C18,5.5817 14.4183,2 10,2C5.5817,2 2,5.5817 2,10C2,14.4183 5.5817,18 10,18C11.8487,18 13.551,17.3729 14.9056,16.3199L20.2929,21.7071L21.7071,20.2929L16.3199,14.9056ZM10,16C13.3137,16 16,13.3137 16,10C16,6.6863 13.3137,4 10,4C6.6863,4 4,6.6863 4,10C4,13.3137 6.6863,16 10,16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,4C9,4 4,6.5 4,12C4,17.5 9,20 12,20C10,19 7,16.5 7,12C7,7.5 10,5 12,4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,3C9,2.4477 9.4477,2 10,2V2C10.5523,2 11,2.4477 11,3V22H9V3Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M4,4H18L21,8.5L18,13H4V4Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,2H13V5H11V2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,13H5V11H2V13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,13H7V12C7,9.2386 9.2386,7 12,7C14.7614,7 17,9.2386 17,12V13H15V12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12V13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19,13H22V11H19V13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19.7782,5.636L18.364,4.2218L16.2426,6.3431L17.6569,7.7573L19.7782,5.636Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6.3432,7.7573L7.7574,6.3431L5.636,4.2218L4.2218,5.636L6.3432,7.7573Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M23,15V17H1V15H23Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M21,21V19H3V21H21Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,4H22V7H17V19H14V7H9V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,9H12V12H9V19H6V12H3V9Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.5104,10.1782C1.9178,10.3581 1.8319,11.0631 2.3015,11.3345C2.4693,11.4315 9.3973,15.3441 9.6797,15.5028C9.9621,15.6615 10.2984,15.572 10.4696,15.3031C10.5683,15.1479 10.8406,14.6701 11.0533,14.2936C11.2092,14.0175 11.0612,13.6279 10.7949,13.4929C10.5286,13.3579 7.9477,11.8821 7.828,11.8212C7.2548,11.5294 7.4612,10.8364 7.8857,10.6865L10.036,9.9275C10.2521,9.8512 10.437,9.6548 10.51,9.4267L11.2244,7.1932C11.4418,6.5136 12.0885,6.675 12.3031,7.0954C12.7326,7.9366 13.7857,9.9179 13.9224,10.225C14.2478,10.9559 15.1574,10.1585 15.5768,9.8801C15.8679,9.6868 15.9506,9.3518 15.8222,9.0493C15.7338,8.8412 13.9584,5.4005 12.8278,3.2093C12.3153,2.216 11.9352,1.4795 11.905,1.4174C11.6315,0.8564 10.9606,0.8586 10.7752,1.438L8.7941,7.6319C8.7193,7.8656 8.5457,8.0485 8.3233,8.1281C7.0895,8.5695 3.0124,10.0259 2.5104,10.1782Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M21.0752,21.9127C20.7967,21.7527 11.9756,16.7785 11.6118,16.5804C11.2481,16.3824 11.1594,16.0421 11.3541,15.6733C11.4531,15.4857 11.6677,15.1116 11.8426,14.81C12.0831,14.3954 12.4336,14.3941 12.6315,14.5171C12.8294,14.64 15.6298,16.2097 15.8109,16.316C16.2386,16.567 16.8692,15.9923 16.5863,15.4888C16.4512,15.2484 15.2711,12.9541 14.8961,12.1979C14.7255,11.8538 14.7721,11.5443 15.1524,11.3384C15.3406,11.2365 15.6773,11.0238 15.9694,10.8349C16.2676,10.642 16.6646,10.787 16.8259,11.0743C16.9873,11.3617 21.7651,20.7442 21.9176,21.0355C22.2204,21.6138 21.6316,22.2324 21.0752,21.9127Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.7071,8.7071L10.5,16.9142L6.2929,12.7071L7.7071,11.2928L10.5,14.0857L17.2928,7.2929L18.7071,8.7071Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.1,6.55C11.1,9.8 6.55,15 6.55,15C6.55,15 2,9.8 2,6.55C2,3.95 4.0371,2 6.55,2C9.0629,2 11.1,3.95 11.1,6.55ZM8,6.5C8,7.3284 7.3284,8 6.5,8C5.6716,8 5,7.3284 5,6.5C5,5.6716 5.6716,5 6.5,5C7.3284,5 8,5.6716 8,6.5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22.1,13.55C22.1,16.8 17.55,22 17.55,22C17.55,22 13,16.8 13,13.55C13,10.95 15.0371,9 17.55,9C20.0629,9 22.1,10.95 22.1,13.55ZM19,13.5C19,14.3284 18.3284,15 17.5,15C16.6716,15 16,14.3284 16,13.5C16,12.6716 16.6716,12 17.5,12C18.3284,12 19,12.6716 19,13.5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,7H3V9H5V7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M21,7H7V9H21V7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,11H3V13H5V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M21,11H7V13H21V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,15H5V17H3V15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M7,15H21V17H7V15Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0H24V24H0V0Z M 0,0"/>
+    <path
+        android:pathData="M2 16C2.00003 14.7001 2.56466 12.1541 4.12771 9.95421C5.65628 7.80288 8.12033 6 12.0001 6C15.8798 6 18.3438 7.80288 19.8724 9.95421C21.4355 12.1541 22.0001 14.7002 22.0001 16V18H19.0001V20H24.0001V16C24.0001 14.2998 23.3147 11.3459 21.5028 8.7958C19.6563 6.19712 16.6204 4 12.0001 4C7.37972 4 4.34377 6.19712 2.49735 8.79579C0.68541 11.3459 3.05772e-05 14.2998 0 16L7.19428e-05 20H5.00005V18H2.00004L2 16Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M14 18C14 17.8208 13.9764 17.6472 13.9323 17.482L18.7071 12.7071L17.2929 11.2929L12.518 16.0677C12.3528 16.0236 12.1792 16 12 16C10.8954 16 10 16.8954 10 18C10 19.1046 10.8954 20 12 20C13.1046 20 14 19.1046 14 18Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M3,9.5C3,8.9713 3.2675,7.8119 4.0518,6.8001C4.7982,5.8371 6.0153,5 8,5C9.9847,5 11.2018,5.8371 11.9483,6.8001C12.7326,7.812 13,8.9713 13,9.5V11H11V13H15V9.5C15,8.5287 14.5856,6.938 13.529,5.5749C12.4346,4.1629 10.6517,3 8,3C5.3484,3 3.5655,4.1629 2.471,5.5749C1.4144,6.938 1,8.5287 1,9.5L1,13H5V11H3L3,9.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,8L7,13H9L11,8H9Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,2H10V6H14V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M14,18H10V22H14V18Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17ZM12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4C2.8954,4 2,4.8954 2,6V18C2,19.1046 2.8954,20 4,20H20C21.1046,20 22,19.1046 22,18V6C22,4.8954 21.1046,4 20,4H4ZM4,6V8L12,13L20,8V6L12,11L4,6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,6C2,4.8954 2.8954,4 4,4H20C21.1046,4 22,4.8954 22,6V18C22,19.1046 21.1046,20 20,20H4C2.8954,20 2,19.1046 2,18V6ZM4,6H20V18H12V14C12,12.8954 11.1046,12 10,12H4V6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,20.6622C7.989,18.9331 10,15.7014 10,12C10,8.2986 7.989,5.0669 5,3.3378C6.4709,2.487 8.1786,2 10,2C15.5228,2 20,6.4771 20,12C20,17.5228 15.5228,22 10,22C8.1786,22 6.4709,21.513 5,20.6622Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,3H11V6H8.5L9,3Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M7.5,12L6,21H11V12H7.5Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M13,12V21H18L16.5,12H13Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M15.5,6L15,3H13V6H15.5Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M22,8H2V10H4V12H5L6,10H18L19,12H20V10H22V8Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,6L12,2L8,6H11V9H13V6H16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,18L12,22L8,18H11V15H13V18H16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,16L22,12L18,8V11H15V13H18V16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6,16L2,12L6,8L6,11H9V13H6V16Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM19.7071,8.7072L12.5,15.9143L8.7929,12.207L10.2071,10.7929L12.5,13.0858L18.2929,7.293L19.7071,8.7072ZM9.543,14.3714L8.1288,12.9571L8,13.0859L5.7071,10.7929L4.2929,12.207L8,15.9144L9.543,14.3714ZM10.9572,10.1287L12.3714,11.543L15.2071,8.7073L13.7929,7.2931L10.9572,10.1287Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.5528,4.1055C3.0468,3.8586 3.6474,4.0588 3.8944,4.5528L4,4.7639C4.3788,5.5215 5.153,6 6,6C6.847,6 7.6212,5.5215 8,4.7639L8.1056,4.5528C8.275,4.214 8.6212,4 9,4C9.3788,4 9.725,4.214 9.8944,4.5528L10,4.7639C10.3788,5.5215 11.153,6 12,6C12.847,6 13.6212,5.5215 14,4.7639L14.1056,4.5528C14.275,4.214 14.6212,4 15,4C15.3788,4 15.725,4.214 15.8944,4.5528L16,4.7639C16.3788,5.5215 17.153,6 18,6C18.847,6 19.6212,5.5215 20,4.7639L20.1056,4.5528C20.3526,4.0588 20.9532,3.8586 21.4472,4.1055C21.9412,4.3525 22.1414,4.9532 21.8944,5.4472L21.7889,5.6583C21.0713,7.0935 19.6045,8 18,8C16.8562,8 15.7823,7.5393 15,6.7548C14.2177,7.5393 13.1438,8 12,8C10.8562,8 9.7823,7.5393 9,6.7548C8.2177,7.5393 7.1438,8 6,8C4.3955,8 2.9287,7.0935 2.2111,5.6583L2.1056,5.4472C1.8586,4.9532 2.0588,4.3525 2.5528,4.1055Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M2.5528,10.1055C3.0468,9.8586 3.6474,10.0588 3.8944,10.5528L4,10.7639C4.3788,11.5215 5.153,12 6,12C6.847,12 7.6212,11.5215 8,10.7639L8.1056,10.5528C8.275,10.214 8.6212,10 9,10C9.3788,10 9.725,10.214 9.8944,10.5528L10,10.7639C10.3788,11.5215 11.153,12 12,12C12.847,12 13.6212,11.5215 14,10.7639L14.1056,10.5528C14.275,10.214 14.6212,10 15,10C15.3788,10 15.725,10.214 15.8944,10.5528L16,10.7639C16.3788,11.5215 17.153,12 18,12C18.847,12 19.6212,11.5215 20,10.7639L20.1056,10.5528C20.3526,10.0588 20.9532,9.8586 21.4472,10.1055C21.9412,10.3525 22.1414,10.9532 21.8944,11.4472L21.7889,11.6583C21.0713,13.0934 19.6045,14 18,14C16.8562,14 15.7823,13.5393 15,12.7548C14.2177,13.5393 13.1438,14 12,14C10.8562,14 9.7823,13.5393 9,12.7548C8.2177,13.5393 7.1438,14 6,14C4.3955,14 2.9287,13.0934 2.2111,11.6583L2.1056,11.4472C1.8586,10.9532 2.0588,10.3525 2.5528,10.1055Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M2.5528,16.1055C3.0468,15.8586 3.6474,16.0588 3.8944,16.5528L4,16.7639C4.3788,17.5215 5.153,18 6,18C6.847,18 7.6212,17.5215 8,16.7639L8.1056,16.5528C8.275,16.214 8.6212,16 9,16C9.3788,16 9.725,16.214 9.8944,16.5528L10,16.7639C10.3788,17.5215 11.153,18 12,18C12.847,18 13.6212,17.5215 14,16.7639L14.1056,16.5528C14.275,16.214 14.6212,16 15,16C15.3788,16 15.725,16.214 15.8944,16.5528L16,16.7639C16.3788,17.5215 17.153,18 18,18C18.847,18 19.6212,17.5215 20,16.7639L20.1056,16.5528C20.3526,16.0588 20.9532,15.8586 21.4472,16.1055C21.9412,16.3525 22.1414,16.9532 21.8944,17.4472L21.7889,17.6583C21.0713,19.0934 19.6045,20 18,20C16.8562,20 15.7823,19.5393 15,18.7548C14.2177,19.5393 13.1438,20 12,20C10.8562,20 9.7823,19.5393 9,18.7548C8.2177,19.5393 7.1438,20 6,20C4.3955,20 2.9287,19.0934 2.2111,17.6583L2.1056,17.4472C1.8586,16.9532 2.0588,16.3525 2.5528,16.1055Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,3C0.8954,3 0,3.8954 0,5V19C0,20.1046 0.8954,21 2,21H22C23.1046,21 24,20.1046 24,19V5C24,3.8954 23.1046,3 22,3H2ZM17.7071,8.2929C17.3166,7.9024 16.6834,7.9024 16.2929,8.2929C15.9024,8.6834 15.9024,9.3166 16.2929,9.7071L17.5858,11H11C10.4477,11 10,11.4477 10,12C10,12.5523 10.4477,13 11,13H17.5858L16.2929,14.2929C15.9024,14.6834 15.9024,15.3166 16.2929,15.7071C16.6834,16.0976 17.3166,16.0976 17.7071,15.7071L20.7071,12.7071C21.0976,12.3166 21.0976,11.6834 20.7071,11.2929L17.7071,8.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,5H2L2,19H22V5ZM2,3C0.8954,3 0,3.8954 0,5V19C0,20.1046 0.8954,21 2,21H22C23.1046,21 24,20.1046 24,19V5C24,3.8954 23.1046,3 22,3H2Z"
+      android:strokeAlpha="0.6"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.6"/>
+  <path
+      android:pathData="M16.2929,8.2929C16.6834,7.9024 17.3166,7.9024 17.7071,8.2929L20.7071,11.2929C21.0976,11.6834 21.0976,12.3166 20.7071,12.7071L17.7071,15.7071C17.3166,16.0976 16.6834,16.0976 16.2929,15.7071C15.9024,15.3166 15.9024,14.6834 16.2929,14.2929L17.5858,13H11C10.4477,13 10,12.5523 10,12C10,11.4477 10.4477,11 11,11H17.5858L16.2929,9.7071C15.9024,9.3166 15.9024,8.6834 16.2929,8.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,0C4.8954,0 4,0.8954 4,2V22C4,23.1046 4.8954,24 6,24H18C19.1046,24 20,23.1046 20,22V2C20,0.8954 19.1046,0 18,0H6ZM13,3L17,6L13,9L13,7H12C11.4477,7 11,7.4477 11,8V15H9V8C9,6.3432 10.3431,5 12,5H13V3ZM7,20C7,19.4477 7.4477,19 8,19H16C16.5523,19 17,19.4477 17,20C17,20.5523 16.5523,21 16,21H8C7.4477,21 7,20.5523 7,20Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8,19L16,19A1,1 0,0 1,17 20L17,20A1,1 0,0 1,16 21L8,21A1,1 0,0 1,7 20L7,20A1,1 0,0 1,8 19z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.4142,5.8284C15.6332,5.0474 14.3668,5.0474 13.5858,5.8284C13.2107,6.2035 13,6.7122 13,7.2426V16.7574C13,17.8182 12.5786,18.8356 11.8284,19.5858C10.2663,21.1479 7.7337,21.1479 6.1716,19.5858C5.4214,18.8356 5,17.8182 5,16.7574V10H7V16.7574C7,17.2878 7.2107,17.7965 7.5858,18.1716C8.3668,18.9526 9.6332,18.9526 10.4142,18.1716C10.7893,17.7965 11,17.2878 11,16.7574V7.2426C11,6.1818 11.4214,5.1644 12.1716,4.4142C13.7337,2.8521 16.2663,2.8521 17.8284,4.4142C18.5786,5.1644 19,6.1818 19,7.2426V15H17V7.2426C17,6.7122 16.7893,6.2035 16.4142,5.8284Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M6,11C7.6568,11 9,9.6568 9,8C9,6.3432 7.6568,5 6,5C4.3432,5 3,6.3432 3,8C3,9.6568 4.3432,11 6,11ZM6,9C6.5523,9 7,8.5523 7,8C7,7.4477 6.5523,7 6,7C5.4477,7 5,7.4477 5,8C5,8.5523 5.4477,9 6,9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M20.7185,14.6408C21.0938,14.2654 21.0938,13.6569 20.7185,13.2815C20.3431,12.9062 19.7346,12.9062 19.3592,13.2815L18,14.6408L16.6408,13.2815C16.2654,12.9062 15.6569,12.9062 15.2815,13.2815C14.9062,13.6569 14.9062,14.2654 15.2815,14.6408L16.6408,16L15.2815,17.3592C14.9062,17.7346 14.9062,18.3431 15.2815,18.7185C15.6569,19.0938 16.2654,19.0938 16.6408,18.7185L18,17.3592L19.3592,18.7185C19.7346,19.0938 20.3431,19.0938 20.7185,18.7185C21.0938,18.3431 21.0938,17.7346 20.7185,17.3592L19.3592,16L20.7185,14.6408Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,7H7V9H17V7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M17,11H7V13H17V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M7,15H14V17H7V15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,5C3,3.8954 3.8954,3 5,3H19C20.1046,3 21,3.8954 21,5V19C21,20.1046 20.1046,21 19,21H5C3.8954,21 3,20.1046 3,19V5ZM5,5H19V19H5L5,5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,5C3,3.8954 3.8954,3 5,3H19C20.1046,3 21,3.8954 21,5V19C21,20.1046 20.1046,21 19,21H5C3.8954,21 3,20.1046 3,19V5ZM5,5H19V11H17V9H15V11H13V9H11V11H9V9H7V11H5V5ZM5,13V15H7V13H9V15H11V13H13V15H15V13H17V15H19V13H17V11H15V13H13V11H11V13H9V11H7V13H5ZM17,18V16H15V18H17ZM13,18V16H11V18H13ZM9,18V16H7V18H9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,15C11.866,15 15,11.866 15,8C15,4.134 11.866,1 8,1C4.134,1 1,4.134 1,8C1,11.866 4.134,15 8,15ZM9,5C9,4.4477 8.5523,4 8,4C7.4477,4 7,4.4477 7,5V8L5.4,9.2C4.9582,9.5314 4.8686,10.1582 5.2,10.6C5.5314,11.0418 6.1582,11.1314 6.6,10.8L8.6,9.3C8.8518,9.1111 9,8.8148 9,8.5V5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C17.3149,2 21.6613,6.1463 21.9811,11.3807C21.3277,10.6813 20.542,10.1072 19.6639,9.698C18.9651,7.3683 17.2331,5.4854 15,4.5815V5C15,6.1046 14.1046,7 13,7H11V9C11,9.5523 10.5523,10 10,10H8V12H10.4995C9.8426,12.8745 9,15 9,15L4.2027,10.2027C4.0701,10.7804 4,11.382 4,12C4,15.6181 6.4018,18.6752 9.698,19.6639C10.1072,20.542 10.6813,21.3277 11.3807,21.9811C6.1463,21.6613 2,17.3149 2,12C2,6.4771 6.4771,2 12,2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,16.4999C11,13.9823 12.6915,11.8598 15,11.2069V13.3367C13.8175,13.8984 13,15.1037 13,16.4999C13,17.7221 13.6265,18.7981 14.576,19.424L16,18V22H12L13.1431,20.8569C11.8396,19.8512 11,18.2736 11,16.4999Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,16.707C22,19.2246 20.3085,21.3471 18,22V19.8702C19.1825,19.3085 20,18.1032 20,16.707C20,15.4848 19.3735,14.4088 18.424,13.7829L17,15.2069V11.2069H21L19.8569,12.35C21.1604,13.3557 22,14.9333 22,16.707Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,12C21,16.1262 18.2233,19.6039 14.4364,20.6663L12.3384,22.8556C12.25,22.9478 12.1278,23 12,23C11.8722,23 11.75,22.9478 11.6616,22.8556L9.5635,20.6663C5.7768,19.6039 3,16.1262 3,12C3,7.0294 7.0294,3 12,3C16.9706,3 21,7.0294 21,12ZM12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,4C2,2.8954 2.8954,2 4,2H20C21.1046,2 22,2.8954 22,4V16C22,17.1046 21.1046,18 20,18H4C2.8954,18 2,17.1046 2,16V4ZM4,4H20V6H4V4ZM4,10V16H20V10H4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,19C8,18.4477 8.4477,18 9,18H15C15.5523,18 16,18.4477 16,19C16,19.5523 15.5523,20 15,20H9C8.4477,20 8,19.5523 8,19Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,0.01L6,0C4.9,0 4,0.9 4,2V22C4,23.1 4.9,24 6,24H18C19.1,24 20,23.1 20,22V2C20,0.9 19.1,0.01 18,0.01ZM18,22H6V2H11C11,2.5523 11.4477,3 12,3C12.5523,3 13,2.5523 13,2H18V22Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0H24V24H0V0Z M 0,0"/>
+    <path
+        android:pathData="M9.35355 4.64645C9.15829 4.45118 8.84171 4.45118 8.64645 4.64645C8.45118 4.84171 8.45118 5.15829 8.64645 5.35355L9.32179 6.0289C8.51016 6.76098 8 7.82091 8 9H16C16 7.82091 15.4898 6.76098 14.6782 6.0289L15.3536 5.35355C15.5488 5.15829 15.5488 4.84171 15.3536 4.64645C15.1583 4.45118 14.8417 4.45118 14.6464 4.64645L13.8436 5.44927C13.2919 5.16223 12.6649 5 12 5C11.3351 5 10.7081 5.16223 10.1564 5.44927L9.35355 4.64645ZM13 7V8H14V7H13ZM10 7V8H11V7H10Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M5 10C5 9.44772 5.44772 9 6 9C6.55228 9 7 9.44772 7 10V14C7 14.5523 6.55228 15 6 15C5.44772 15 5 14.5523 5 14V10Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M17 10C17 9.44772 17.4477 9 18 9C18.5523 9 19 9.44772 19 10V14C19 14.5523 18.5523 15 18 15C17.4477 15 17 14.5523 17 14V10Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M9 17C8.44772 17 8 16.5523 8 16V10H16V16C16 16.5523 15.5523 17 15 17V19C15 19.5523 14.5523 20 14 20C13.4477 20 13 19.5523 13 19V17H11V19C11 19.5523 10.5523 20 10 20C9.44772 20 9 19.5523 9 19V17Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M22 0H2V24H22V0ZM20 3H4V21H20V3Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.5"/>
+  </group>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,1L14,1.01C15.1,1.01 16,1.9 16,3V9H14V5H4V9C2.9,9 2,9.9 2,11V3C2,1.9 2.9,1 4,1Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M23.99,21L24,11C24,9.9 23.1,9 22,9L4,9C2.9,9 2,9.9 2,11L2,21C2,22.1 2.9,23 4,23L22,23C23.1,23 23.99,22.1 23.99,21ZM6,21L6,11L20,11V21L6,21Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,9H22C23.1,9 24,9.9 24,11L23.99,21C23.99,22.1 23.1,23 22,23H14.0023C15.1012,22.9987 16,22.0992 16,21L20,21L20,11L16,11V9Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M14,1.01L4,1C2.9,1 2,1.9 2,3V21C2,22.1 2.9,23 4,23H14C15.1,23 16,22.1 16,21V3C16,1.9 15.1,1.01 14,1.01ZM14,19H4V5H14V19Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,11H14V18H21V11ZM13,10V19H22V10H13Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M6,5H4V18H6V5Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M16,11H14V18H16V11Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M9,6H7V7H9V6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,10H7V11H9V10Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,14H7V15H9V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,8H7V9H9V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,12H7V13H9V12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9,16H7V17H9V16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,6H10V7H12V6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,10H10V11H12V10Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,14H10V15H12V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,8H10V9H12V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,12H10V13H12V12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,16H10V17H12V16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,19V4H14V19H3ZM4,5H13V18H4V5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17,12H18V14H17V12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,15H17V17H18V15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20,12H19V14H20V12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20,15H19V17H20V15Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,12L10,8V16L15,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,5C3,3.8954 3.8954,3 5,3H19C20.1046,3 21,3.8954 21,5V19C21,20.1046 20.1046,21 19,21H5C3.8954,21 3,20.1046 3,19V5ZM5,5H19V19H5L5,5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,5H11V11H5V13H11V19H13V13H19V11H13V5Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,21C13.8273,21 16.35,19.6963 18,17.6573V14.8293C16.8348,14.4175 16,13.3062 16,12C16,10.6938 16.8348,9.5825 18,9.1707V6.3427C16.35,4.3037 13.8273,3 11,3C6.0294,3 2,7.0294 2,12C2,16.9706 6.0294,21 11,21ZM10,10V8H12V10H10ZM10,17V12H12V17H10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M20,10C20,9.4477 20.4477,9 21,9C21.5523,9 22,9.4477 22,10V11H23C23.5523,11 24,11.4477 24,12C24,12.5523 23.5523,13 23,13H22V14C22,14.5523 21.5523,15 21,15C20.4477,15 20,14.5523 20,14V13H19C18.4477,13 18,12.5523 18,12C18,11.4477 18.4477,11 19,11H20V10Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,8L16,16H14L13.625,15H10.375L10,16H8L11,8H13ZM12,10.6667L12.875,13H11.125L12,10.6667Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4.6408,20.7026C4.8592,21.3908 5.3254,22.0028 6,22.3923C6.6746,22.7817 7.4375,22.8794 8.1427,22.7246C8.5427,22.6367 8.9242,22.4676 9.2604,22.2243C9.4299,22.6031 9.6757,22.9403 9.9782,23.2164C10.5115,23.7031 11.2211,24 12,24C12.7789,24 13.4886,23.7031 14.0219,23.2164C14.3243,22.9403 14.5701,22.6031 14.7396,22.2243C15.0758,22.4676 15.4572,22.6367 15.8572,22.7246C16.5625,22.8794 17.3254,22.7817 18,22.3923C18.6746,22.0028 19.1407,21.3909 19.3591,20.7027C19.483,20.3124 19.5273,19.8975 19.4847,19.4848C19.8975,19.5274 20.3123,19.4831 20.7027,19.3592C21.3909,19.1408 22.0028,18.6747 22.3923,18.0001C22.7818,17.3255 22.8795,16.5626 22.7246,15.8574C22.6368,15.4573 22.4676,15.0758 22.2243,14.7396C22.6031,14.5701 22.9404,14.3243 23.2165,14.0217C23.7032,13.4885 24,12.7789 24,12C24,11.221 23.7031,10.5114 23.2163,9.9781C22.9402,9.6756 22.6031,9.4299 22.2244,9.2604C22.4676,8.9243 22.6367,8.5429 22.7246,8.143C22.8795,7.4377 22.7818,6.6747 22.3923,6.0001C22.0029,5.3255 21.3911,4.8595 20.703,4.641C20.3126,4.517 19.8976,4.4727 19.4847,4.5153C19.5273,4.1024 19.483,3.6875 19.3591,3.297C19.1406,2.6089 18.6745,1.9971 18,1.6077C17.3254,1.2182 16.5624,1.1205 15.8572,1.2754C15.4572,1.3633 15.0758,1.5324 14.7396,1.7756C14.5701,1.3969 14.3243,1.0597 14.0219,0.7836C13.4886,0.2969 12.7789,0 12,0C11.2211,0 10.5115,0.2969 9.9782,0.7836C9.6757,1.0597 9.4299,1.3969 9.2604,1.7756C8.9242,1.5324 8.5428,1.3633 8.1428,1.2754C7.4376,1.1205 6.6746,1.2182 6,1.6077C5.3254,1.9971 4.8593,2.609 4.6409,3.2972C4.5169,3.6876 4.4727,4.1025 4.5153,4.5153C4.1024,4.4728 3.6875,4.517 3.2972,4.641C2.609,4.8594 1.9972,5.3255 1.6077,6.0001C1.2182,6.6747 1.1205,7.4377 1.2755,8.1429C1.3633,8.5429 1.5324,8.9242 1.7757,9.2604C1.3969,9.4299 1.0598,9.6756 0.7837,9.9781C0.2969,10.5114 0,11.221 0,12C0,12.7789 0.2968,13.4885 0.7835,14.0217C1.0597,14.3243 1.3969,14.5701 1.7757,14.7396C1.5324,15.0759 1.3633,15.4574 1.2754,15.8574C1.1206,16.5626 1.2183,17.3255 1.6077,18.0001C1.9972,18.6747 2.6092,19.1408 3.2975,19.3593C3.6878,19.4831 4.1026,19.5273 4.5152,19.4848C4.4727,19.8975 4.5169,20.3123 4.6408,20.7026ZM21.4073,12.9141C20.8578,13.1601 20.4483,13.6405 20.2925,14.222C20.1367,14.8035 20.2511,15.4243 20.604,15.912C20.8308,16.2255 20.8622,16.6503 20.6603,17.0001C20.4584,17.3498 20.0748,17.535 19.6899,17.4953C19.0911,17.4336 18.4963,17.6449 18.0706,18.0706C17.6449,18.4962 17.4336,19.091 17.4953,19.6899C17.535,20.0748 17.3497,20.4583 17,20.6602C16.6503,20.8621 16.2255,20.8308 15.912,20.604C15.4242,20.2511 14.8035,20.1367 14.222,20.2925C13.6405,20.4483 13.1601,20.8578 12.9141,21.4073C12.7561,21.7604 12.4038,22 12,22C11.5962,22 11.2439,21.7604 11.0859,21.4073C10.8399,20.8578 10.3595,20.4483 9.778,20.2925C9.1965,20.1367 8.5758,20.2511 8.088,20.604C7.7745,20.8308 7.3497,20.8621 7,20.6602C6.6503,20.4583 6.465,20.0748 6.5047,19.6899C6.5664,19.091 6.3551,18.4963 5.9295,18.0706C5.5038,17.6449 4.909,17.4336 4.3101,17.4953C3.9253,17.535 3.5417,17.3498 3.3398,17.0001C3.1379,16.6503 3.1692,16.2255 3.396,15.912C3.749,15.4243 3.8634,14.8035 3.7076,14.222C3.5517,13.6405 3.1423,13.1601 2.5927,12.9141C2.2396,12.7561 2,12.4038 2,12C2,11.5962 2.2396,11.244 2.5927,11.0859C3.1422,10.8399 3.5517,10.3596 3.7075,9.7781C3.8633,9.1966 3.7489,8.5758 3.396,8.088C3.1692,7.7746 3.1379,7.3498 3.3398,7.0001C3.5417,6.6503 3.9253,6.4651 4.3101,6.5048C4.909,6.5665 5.5038,6.3552 5.9295,5.9295C6.3552,5.5038 6.5665,4.909 6.5047,4.3101C6.465,3.9252 6.6503,3.5416 7,3.3397C7.3497,3.1378 7.7745,3.1692 8.088,3.396C8.5758,3.7489 9.1965,3.8633 9.778,3.7075C10.3595,3.5517 10.8399,3.1422 11.0859,2.5927C11.244,2.2396 11.5962,2 12,2C12.4038,2 12.756,2.2396 12.9141,2.5927C13.1601,3.1422 13.6405,3.5517 14.222,3.7075C14.8035,3.8633 15.4242,3.7489 15.912,3.396C16.2255,3.1692 16.6503,3.1378 17,3.3397C17.3497,3.5416 17.535,3.9252 17.4953,4.3101C17.4335,4.909 17.6448,5.5038 18.0705,5.9295C18.4962,6.3552 19.091,6.5665 19.6899,6.5048C20.0748,6.4651 20.4584,6.6503 20.6603,7.0001C20.8622,7.3498 20.8308,7.7746 20.604,8.0881C20.2511,8.5758 20.1367,9.1966 20.2925,9.7781C20.4484,10.3596 20.8578,10.8399 21.4073,11.0859C21.7605,11.244 22,11.5962 22,12C22,12.4038 21.7604,12.756 21.4073,12.9141Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,8L16,16H14L13.625,15H10.375L10,16H8L11,8H13ZM12,10.6667L12.875,13H11.125L12,10.6667Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M2,4C2,2.8954 2.8954,2 4,2H20C21.1046,2 22,2.8954 22,4V20C22,21.1046 21.1046,22 20,22H4C2.8954,22 2,21.1046 2,20V4ZM4,4H20V20H4V4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6,5C5.4477,5 5,5.4477 5,6C5,6.5523 5.4477,7 6,7C6.5523,7 7,6.5523 7,6C7,5.4477 6.5523,5 6,5Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M6,17C5.4477,17 5,17.4477 5,18C5,18.5523 5.4477,19 6,19C6.5523,19 7,18.5523 7,18C7,17.4477 6.5523,17 6,17Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M17,6C17,5.4477 17.4477,5 18,5C18.5523,5 19,5.4477 19,6C19,6.5523 18.5523,7 18,7C17.4477,7 17,6.5523 17,6Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M18,17C17.4477,17 17,17.4477 17,18C17,18.5523 17.4477,19 18,19C18.5523,19 19,18.5523 19,18C19,17.4477 18.5523,17 18,17Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,13H5V21H3V13Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M11,9H9V7H11V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,9H13V11H11V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,3H12V5H16V15H9V13H3V3ZM5,5H7V7H5V5ZM9,7H7V9H5V11H7V9H9V11H11V13H13V11H15V9H13V7H11V5H9V7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19,13H17V16H14V18H17V21H19V18H22V16H19V13Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,13H8V21H6V13Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M14,9H12V7H14V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,9H16V11H14V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6,3H15V5H19V15H12V13H6V3ZM8,5H10V7H8V5ZM12,7H10V9H8V11H10V9H12V11H14V13H16V11H18V9H16V7H14V5H12V7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,13H8V21H6V13Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M12,7H14V9H12V7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,3H6V13H18V3ZM8,5H10V7H8V5ZM12,7H10V9H8V11H10V9H12V11H14V9H16V7H14V5H12V7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,6.9C22,10.4 17,16 17,16C17,16 12,10.4 12,6.9C12,4.1 14.2386,2 17,2C19.7614,2 22,4.1 22,6.9ZM19,7C19,8.1046 18.1046,9 17,9C15.8954,9 15,8.1046 15,7C15,5.8954 15.8954,5 17,5C18.1046,5 19,5.8954 19,7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.6636,16.3279C14.1711,15.7188 13.5107,14.8641 12.8464,13.8874C12.6964,13.667 12.5449,13.4385 12.3942,13.2033L11,14L4,10V8L11,12L11.5066,11.7105C11.3143,11.3574 11.1317,10.9977 10.9648,10.6355C10.449,9.5161 10,8.1997 10,6.9C10,6.5935 10.0191,6.2932 10.0561,6H4C2.8954,6 2,6.8954 2,8V17C2,18.1046 2.8954,19 4,19H16.9974C16.8378,18.8211 16.6776,18.6428 16.5174,18.4645C15.8871,17.763 15.2569,17.0616 14.6636,16.3279Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,4C22.1046,4 23,4.8954 23,6V18C23,19.1046 22.1046,20 21,20H7.9612C7.3537,20 6.7791,19.7238 6.3995,19.2494L1.3124,12.8904C1.1102,12.6377 1,12.3237 1,12C1,11.6763 1.1102,11.3623 1.3124,11.1096L6.3995,4.7506C6.7791,4.2762 7.3537,4 7.9612,4H21ZM15,5C15.5523,5 16,5.4477 16,6V7H17C17.5523,7 18,7.4477 18,8C18,8.5523 17.5523,9 17,9H14V11H16C17.1046,11 18,11.8954 18,13V15C18,16.1046 17.1046,17 16,17V18C16,18.5523 15.5523,19 15,19C14.4477,19 14,18.5523 14,18V17H13C12.4477,17 12,16.5523 12,16C12,15.4477 12.4477,15 13,15H16V13H14C12.8954,13 12,12.1046 12,11V9C12,7.8954 12.8954,7 14,7V6C14,5.4477 14.4477,5 15,5ZM5,12C5,12.5523 4.5523,13 4,13C3.4477,13 3,12.5523 3,12C3,11.4477 3.4477,11 4,11C4.5523,11 5,11.4477 5,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,6H7V10H17V6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4,3V13H8V21H16V13H20V3H4ZM10,11H6V5H18V11H14V19H10V11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7.0765,8.8531L8.8871,11.4396L10.1891,9.8121L8.715,7.7062C7.9665,6.6368 6.7433,6 5.438,6H2V8H5.438C6.0907,8 6.7022,8.3184 7.0765,8.8531Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M12.285,16.2938L11.2776,14.8546L12.5796,13.2271L13.9235,15.1469C14.2978,15.6816 14.9093,16 15.562,16H18V14L22,17L18,20V18H15.562C14.2567,18 13.0336,17.3632 12.285,16.2938Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M18,4L22,7L18,10V8H16.4419C15.8343,8 15.2597,8.2762 14.8801,8.7506L8.6816,16.4988C7.9225,17.4476 6.7733,18 5.5581,18H2V16H5.5581C6.1657,16 6.7403,15.7238 7.1199,15.2494L13.3184,7.5012C14.0775,6.5524 15.2267,6 16.4419,6H18V4Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,3H3V9H9V3ZM7,5H5V7H7V5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21,3H15V9H21V3ZM19,5H17V7H19V5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3,15H9V21H3V15ZM5,17H7V19H5V17Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11,9H13V5H11V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,11H3V13H5V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,15H13V11H9V13H11V15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M17,11V13H21V11H17Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,17V21H13V19H17V21H19V19H21V15H19V19H17V15H15V17H11Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,7H14V9H20V7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20,11H14V13H20V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,15H20V17H14V15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M0,5C0,3.8954 0.8954,3 2,3H22C23.1046,3 24,3.8954 24,5V19C24,20.1046 23.1046,21 22,21H2C0.8954,21 0,20.1046 0,19V5ZM2,5H22V19H2L2,5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M10,5h2v14h-2z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,18L19,21V5C19,3.8954 18.1046,3 17,3H7C5.8954,3 5,3.8954 5,5V21L12,18ZM7,17.9669L12,15.8241L17,17.9669V5H7V17.9669Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,3H7C5.8954,3 5,3.8954 5,5V21L12,18L19,21V5C19,3.8954 18.1046,3 17,3Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,5H6V19H18V5ZM6,3C4.8954,3 4,3.8954 4,5V19C4,20.1046 4.8954,21 6,21H18C19.1046,21 20,20.1046 20,19V5C20,3.8954 19.1046,3 18,3H6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8,7h8v2h-8z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,11h8v2h-8z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M8,15h6v2h-6z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,6h12v12h-12z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.8444,12.1556L13,16L22,16V7L18.2622,10.7378C16.3248,9.0336 13.7831,8 11,8C6.5345,8 2.6905,10.6608 0.967,14.4835L2.7581,15.379C4.1516,12.2116 7.3176,10 11,10C13.2307,10 15.2719,10.8116 16.8444,12.1556Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M0,19L0,19.0217V18.9783L0,19Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,18C14.6124,18 16.8349,16.3304 17.6586,14H19.748C18.8599,17.4505 15.7277,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C14.2091,4 16.2091,4.8954 17.6569,6.3432L20,4V11H13L16.2426,7.7574C15.1569,6.6716 13.6569,6 12,6C8.6863,6 6,8.6863 6,12C6,15.3137 8.6863,18 12,18Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.9378,8.5001L9.6095,12.6406L8.5,18.0622L12.6406,14.3906L18.0622,15.5001L14.3906,11.3595L15.5,5.9379L11.3595,9.6095L5.9378,8.5001Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M21.6593,9.4118C23.0887,14.7465 19.9229,20.2299 14.5882,21.6593C9.2536,23.0887 3.7702,19.9229 2.3408,14.5882C0.9114,9.2536 4.0772,3.7702 9.4118,2.3408C14.7465,0.9114 20.2299,4.0772 21.6593,9.4118ZM19.7274,9.9295C20.871,14.1972 18.3383,18.5839 14.0706,19.7274C9.8029,20.871 5.4162,18.3383 4.2726,14.0706C3.1291,9.8029 5.6618,5.4162 9.9295,4.2726C14.1972,3.1291 18.5839,5.6618 19.7274,9.9295Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.4019,7.036L10.1699,5.1699L10.0359,7.402L10.9019,7.902L11.4019,7.036Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M16.0981,10.902L16.5981,10.0359L18.8301,10.1699L16.9641,11.402L16.0981,10.902Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M7.9019,13.0981L7.0359,12.5981L5.1699,13.8302L7.4019,13.9642L7.9019,13.0981Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M13.0981,16.0981L12.5981,16.9642L13.8301,18.8302L13.9641,16.5981L13.0981,16.0981Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M18,12L18,12A1,1 0,0 1,17 13L7,13A1,1 0,0 1,6 12L6,12A1,1 0,0 1,7 11L17,11A1,1 0,0 1,18 12z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.5857,12L5.2929,6.7071L6.7071,5.2929L12,10.5857L17.2928,5.2929L18.7071,6.7071L13.4142,12L18.7071,17.2928L17.2928,18.7071L12,13.4142L6.7071,18.7071L5.2929,17.2928L10.5857,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.5858,12L7.2929,8.7071L8.7071,7.2929L12,10.5857L15.2929,7.2929L16.7071,8.7071L13.4142,12L16.7071,15.2928L15.2929,16.7071L12,13.4142L8.7071,16.7071L7.2929,15.2928L10.5858,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,18C9.3876,18 7.1651,16.3304 6.3414,14H4.252C5.1401,17.4505 8.2723,20 12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C9.7909,4 7.7909,4.8954 6.3432,6.3432L4,4V11H11L7.7574,7.7574C8.8432,6.6716 10.3431,6 12,6C15.3137,6 18,8.6863 18,12C18,15.3137 15.3137,18 12,18Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.6474,11.3499C12.8076,12.0192 13.0228,12.8798 13.1188,13.2321L11.7659,12.5323L12.6474,11.3499Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10.177,10.1683L10.7076,10.1443C10.4399,10.5733 10.0171,11.2036 9.8057,11.5172L9.18,11.1941L10.177,10.1683Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13.5,4L21.7731,17.6262C21.9215,17.8707 22,18.1512 22,18.4373C22,19.3003 21.3003,20 20.4373,20H3.5627C2.6997,20 2,19.3003 2,18.4373C2,18.1512 2.0785,17.8707 2.2269,17.6262L10.5,4C11.25,3 12.75,3 13.5,4ZM14,8C14,8.5523 13.5523,9 13,9C12.4477,9 12,8.5523 12,8C12,7.4477 12.4477,7 13,7C13.5523,7 14,7.4477 14,8ZM14.1065,13.7435C13.9272,12.8854 13.5,10 13.5,10L11.7502,9H10C10,9 8.9193,10.2692 8.4274,10.8204C8.3536,10.7981 8.2743,10.8031 8.2038,10.8345C8.1332,10.8659 8.076,10.9218 8.0422,10.992C8.003,11.0731 7.9966,11.1666 8.0243,11.2524C8.052,11.3383 8.1117,11.4097 8.1906,11.4515L15,15L14,16V18H19L17,14L15.6615,14.5497L14.1065,13.7435ZM9.18,13L8,18H9L10,14.5L11,15.5056L11.5,18H12.4165L12,14.5L9.18,13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,20C13.1046,20 14,19.1046 14,18C14,16.8954 13.1046,16 12,16C10.8954,16 10,16.8954 10,18C10,19.1046 10.8954,20 12,20Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M13,14L11,14L11,7L13,7L13,14Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="14"
+          android:startX="12"
+          android:endY="7"
+          android:endX="12"
+          android:type="linear">
+        <item android:offset="0" android:color="#00FFFFFF"/>
+        <item android:offset="1" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M16.0001,6.2731C16.0001,6.097 15.9362,5.9268 15.8202,5.7943L12.7988,2.3415C12.6089,2.1245 12.3346,2 12.0463,2H11.9538C11.6654,2 11.3911,2.1245 11.2012,2.3415L8.1799,5.7944C8.064,5.9268 8.0001,6.0969 8.0001,6.2729C8,6.6744 8.3256,7 8.7271,6.9999L15.2731,6.9999C15.6745,7 16,6.6745 16.0001,6.2731Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,18C16,20.2091 14.2091,22 12,22C9.7909,22 8,20.2091 8,18C8,15.7909 9.7909,14 12,14C14.2091,14 16,15.7909 16,18ZM14,18C14,19.1046 13.1046,20 12,20C10.8954,20 10,19.1046 10,18C10,16.8954 10.8954,16 12,16C13.1046,16 14,16.8954 14,18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.0001,4C10.8956,4 10.0001,4.8954 10.0001,6C10.0001,7.1046 10.8956,8 12.0001,8C13.1047,8 14.0001,7.1046 14.0001,6C14.0001,4.8954 13.1047,4 12.0001,4Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M11.0001,10L13.0001,10L13.0001,17L11.0001,17L11.0001,10Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="10"
+          android:startX="12.0001"
+          android:endY="17"
+          android:endX="12.0001"
+          android:type="linear">
+        <item android:offset="0" android:color="#00FFFFFF"/>
+        <item android:offset="1" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M8,17.7269C8,17.903 8.0639,18.0732 8.1799,18.2057L11.2013,21.6585C11.3912,21.8755 11.6655,22 11.9539,22H12.0464C12.3347,22 12.609,21.8755 12.7989,21.6585L15.8202,18.2056C15.9361,18.0731 16,17.9031 16,17.7271C16.0001,17.3255 15.6746,17 15.2731,17.0001L8.727,17.0001C8.3256,17 8.0001,17.3255 8,17.7269Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8.0001,6C8.0001,3.7909 9.791,2 12.0001,2C14.2093,2 16.0001,3.7909 16.0001,6C16.0001,8.2091 14.2093,10 12.0001,10C9.791,10 8.0001,8.2091 8.0001,6ZM10.0001,6C10.0001,4.8954 10.8955,4 12.0001,4C13.1047,4 14.0001,4.8954 14.0001,6C14.0001,7.1046 13.1047,8 12.0001,8C10.8955,8 10.0001,7.1046 10.0001,6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,3C6.7909,3 5,4.7909 5,7V11H7V7C7,5.8954 7.8954,5 9,5C10.1046,5 11,5.8954 11,7V17C11,19.2091 12.7909,21 15,21C17.2091,21 19,19.2091 19,17V15H17V17C17,18.1046 16.1046,19 15,19C13.8954,19 13,18.1046 13,17V7C13,4.7909 11.2091,3 9,3Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M20,11C20,12.1046 19.1046,13 18,13C16.8954,13 16,12.1046 16,11C16,9.8954 16.8954,9 18,9C19.1046,9 20,9.8954 20,11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6,18.95L8.7114,19.899C8.8525,19.9484 9,19.8437 9,19.6943C9,19.6651 8.9941,19.6361 8.9826,19.6093L6.232,13.1533C6.1924,13.0603 6.1011,13 6,13C5.8989,13 5.8076,13.0603 5.768,13.1533L3.0174,19.6093C3.0059,19.6361 3,19.6651 3,19.6943C3,19.8437 3.1475,19.9484 3.2886,19.899L6,18.95Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,2H22V4H6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M6,15H22V17H6V15Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M22,20H6V22H22V20Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,8h20v3h-20z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,2H22V4H6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M6,7H22V9H6V7Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M22,20H6V22H22V20Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,2H22V4H6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M6,7H22V9H6V7Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M22,20H6V22H22V20Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M2,13h20v3h-20z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,8C14.3431,8 13,9.3432 13,11V13C13,15.7614 10.7614,18 8,18C8.5523,18 9,17.5523 9,17C9,16.4477 8.5523,16 8,16C9.6568,16 11,14.6569 11,13V11C11,8.2386 13.2386,6 16,6C15.4477,6 15,6.4477 15,7C15,7.5523 15.4477,8 16,8Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M16,8C17.6569,8 19,9.3432 19,11V15C19,15.5523 19.4477,16 20,16C20.5523,16 21,15.5523 21,15V11C21,8.2386 18.7614,6 16,6C16.5523,6 17,6.4477 17,7C17,7.5523 16.5523,8 16,8Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M8,16C7.4477,16 7,16.4477 7,17C7,17.5523 7.4477,18 8,18C5.2386,18 3,15.7614 3,13V9C3,8.4477 3.4477,8 4,8C4.5523,8 5,8.4477 5,9V13C5,14.6569 6.3432,16 8,16Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,10C5.6568,10 7,8.6568 7,7C7,5.3432 5.6568,4 4,4C2.3431,4 1,5.3432 1,7C1,8.6568 2.3431,10 4,10ZM4,8C4.5523,8 5,7.5523 5,7C5,6.4477 4.5523,6 4,6C3.4477,6 3,6.4477 3,7C3,7.5523 3.4477,8 4,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8,20C9.6568,20 11,18.6569 11,17C11,15.3431 9.6568,14 8,14C6.3432,14 5,15.3431 5,17C5,18.6569 6.3432,20 8,20ZM8,18C8.5523,18 9,17.5523 9,17C9,16.4477 8.5523,16 8,16C7.4477,16 7,16.4477 7,17C7,17.5523 7.4477,18 8,18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19,7C19,8.6568 17.6569,10 16,10C14.3431,10 13,8.6568 13,7C13,5.3432 14.3431,4 16,4C17.6569,4 19,5.3432 19,7ZM17,7C17,7.5523 16.5523,8 16,8C15.4477,8 15,7.5523 15,7C15,6.4477 15.4477,6 16,6C16.5523,6 17,6.4477 17,7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M20,20C21.6569,20 23,18.6569 23,17C23,15.3431 21.6569,14 20,14C18.3431,14 17,15.3431 17,17C17,18.6569 18.3431,20 20,20ZM20,18C20.5523,18 21,17.5523 21,17C21,16.4477 20.5523,16 20,16C19.4477,16 19,16.4477 19,17C19,17.5523 19.4477,18 20,18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,2H6V4H22V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M22,6H6V8H22V6Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M6,10H22V12H6V10Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M22,14H6V16H22V14Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,19h20v3h-20z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,14C13.1046,14 14,13.1046 14,12C14,10.8954 13.1046,10 12,10C10.8954,10 10,10.8954 10,12C10,13.1046 10.8954,14 12,14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,18C15.3137,18 18,15.3137 18,12C18,8.6863 15.3137,6 12,6C8.6863,6 6,8.6863 6,12C6,15.3137 8.6863,18 12,18ZM12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,2V15H12V2H3ZM10,4H5V13H10V12H8V10H10V8H8V6H10V4Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M21,13V22L3,22V13H21ZM19,15V20L5,20L5,15L7,15V17H9V15H11V17H13V15H15V17H17V15L19,15Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM8,12C9.1046,12 10,11.1046 10,10C10,8.8954 9.1046,8 8,8C6.8954,8 6,8.8954 6,10C6,11.1046 6.8954,12 8,12ZM16,12C17.1046,12 18,11.1046 18,10C18,8.8954 17.1046,8 16,8C14.8954,8 14,8.8954 14,10C14,11.1046 14.8954,12 16,12ZM16,18C16,15.7909 14.2091,14 12,14C9.7909,14 8,15.7909 8,18H16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,2V4H18V5.9378C18,7.5214 17.3777,9.002 16.3239,10.0978C15.8482,10.5925 15.2847,11.0087 14.6508,11.3206L15.7482,12.1985C15.9401,12.3521 16.1213,12.5163 16.291,12.69C17.3799,13.804 18,15.3069 18,16.8837V20H19V22H5V20H6V16.8837C6,15.3069 6.6201,13.804 7.709,12.69C7.8787,12.5163 8.0599,12.3521 8.2518,12.1985L9.3492,11.3206C8.7153,11.0087 8.1518,10.5925 7.6761,10.0978C6.6223,9.002 6,7.5214 6,5.9378V4H5V2H19ZM8,4V5.9378C8,7.4698 8.8739,8.8577 10.2323,9.5261L11,9.9039V12.5612L9.5012,13.7603C8.5524,14.5194 8,15.6686 8,16.8837V20H16V16.8837C16,15.6686 15.4476,14.5194 14.4988,13.7603L13,12.5613V9.9039L13.7677,9.5261C15.1261,8.8577 16,7.4698 16,5.9378V4H8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9,5V5.9378C9,7.4637 10.4497,9 12,9C13.5503,9 15,7.4637 15,5.9378V5H9Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M9,19V17.0622C9,15.495 10.396,14 12,14C13.604,14 15,15.495 15,17.0622V19H9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,3C3.8954,3 3,3.8954 3,5V19C3,20.1046 3.8954,21 5,21H19C20.1046,21 21,20.1046 21,19V7L17,3H5ZM5,5H15V9H5V5ZM15,16C15,17.6569 13.6569,19 12,19C10.3431,19 9,17.6569 9,16C9,14.3431 10.3431,13 12,13C13.6569,13 15,14.3431 15,16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,2L16,4L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,4H6V20H18V8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4C4,2.8954 4.8954,2 6,2H14V4Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M13,9H11V14H9L12,18L15,14H13V9Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.5,14H14.71L14.43,13.73C15.41,12.59 16,11.11 16,9.5C16,5.91 13.09,3 9.5,3C5.91,3 3,5.91 3,9.5C3,13.09 5.91,16 9.5,16C11.11,16 12.59,15.41 13.73,14.43L14,14.71V15.5L19,20.49L20.49,19L15.5,14V14ZM9.5,14C7.01,14 5,11.99 5,9.5C5,7.01 7.01,5 9.5,5C11.99,5 14,7.01 14,9.5C14,11.99 11.99,14 9.5,14Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,4C8,2.8954 8.8954,2 10,2H20C21.1046,2 22,2.8954 22,4V14C22,15.1046 21.1046,16 20,16H18V8C18,6.8954 17.1046,6 16,6H8V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11.4697,12.4697L12.5303,13.5303L8,18.0607L5.4697,15.5303L6.5303,14.4697L8,15.9393L11.4697,12.4697Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4,8C2.8954,8 2,8.8954 2,10V20C2,21.1046 2.8954,22 4,22H14C15.1046,22 16,21.1046 16,20V10C16,8.8954 15.1046,8 14,8H4ZM14,10H4V20H14V10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,1L11.7823,1.0078C10.2271,1.1193 9,2.4164 9,4V5H4V19H7.6294L8.3241,20.0917L8.8773,20.9214C9.4483,21.778 10.1933,22.4823 11.0482,23H4C2.9,23 2,22.1 2,21V3C2,1.9 2.9,1 4,1Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,3C11.4477,3 11,3.4477 11,4V15L8.8323,12.8323C8.3727,12.3726 7.6273,12.3726 7.1677,12.8323C6.7776,13.2224 6.7107,13.8312 7.0069,14.2966L10,19L10.5413,19.812C11.4526,21.1789 12.9868,22 14.6297,22H19.2449C20.7665,22 22,20.7665 22,19.2449V8C22,7.4477 21.5523,7 21,7C20.4477,7 20,7.4477 20,8V11.7619C20,11.8934 19.8934,12 19.7619,12H19.381C19.1706,12 19,11.8294 19,11.619V5C19,4.4477 18.5523,4 18,4C17.4477,4 17,4.4477 17,5V10.6667C17,10.8508 16.8508,11 16.6667,11H16.4286C16.1919,11 16,10.8081 16,10.5714V3C16,2.4477 15.5523,2 15,2C14.4477,2 14,2.4477 14,3V10.5714C14,10.8081 13.8081,11 13.5714,11H13.381C13.1706,11 13,10.8294 13,10.619V4C13,3.4477 12.5523,3 12,3Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8,5V9C8,10.1046 8.8954,11 10,11V17H11V11C12.1046,11 13,10.1046 13,9V5H12V9H11V5H10V9H9V5H8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,7C14,5.8954 14.8954,5 16,5V17H15V11C14.4477,11 14,10.5523 14,10V7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H18C19.1046,2 20,2.8954 20,4V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4ZM6,4H18V18H6V4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,6h12v12h-12z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M22,4H4C2.8954,4 2,4.8954 2,6V18C2,19.1046 2.8954,20 4,20H22V18H6V6H22V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,8H14V10H16V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,11H14V13H16V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,14H14V16H16V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,8H11V10H13V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,11H11V13H13V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,14H11V16H13V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10,8H8V10H10V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10,11H8V13H10V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10,14H8V16H10V14Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,6h12v12h-12z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M2,4H20C21.1046,4 22,4.8954 22,6V18C22,19.1046 21.1046,20 20,20H2V18H18V6H2V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,8H10V10H8V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,11H10V13H8V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,14H10V16H8V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,8H13V10H11V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,11H13V13H11V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,14H13V16H11V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,8H16V10H14V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,11H16V13H14V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,14H16V16H14V14Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.7071,9.7071L15.2929,8.2929L10,13.5858L7.7071,11.2929L6.2929,12.7071L10,16.4142L16.7071,9.7071Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,8H4V6H13V16H20V18H11V8Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,9C5.1046,9 6,8.1046 6,7C6,5.8954 5.1046,5 4,5C2.8954,5 2,5.8954 2,7C2,8.1046 2.8954,9 4,9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,9C13.1046,9 14,8.1046 14,7C14,5.8954 13.1046,5 12,5C10.8954,5 10,5.8954 10,7C10,8.1046 10.8954,9 12,9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,17C14,18.1046 13.1046,19 12,19C10.8954,19 10,18.1046 10,17C10,15.8954 10.8954,15 12,15C13.1046,15 14,15.8954 14,17Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20,19C21.1046,19 22,18.1046 22,17C22,15.8954 21.1046,15 20,15C18.8954,15 18,15.8954 18,17C18,18.1046 18.8954,19 20,19Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,3C3.8954,3 3,3.8954 3,5V19C3,20.1046 3.8954,21 5,21H19C20.1046,21 21,20.1046 21,19V5C21,3.8954 20.1046,3 19,3H5ZM15,10C15,9.4477 15.4477,9 16,9H18V7H16C14.3431,7 13,8.3432 13,10V12H11V14H13V19H15V14H18V12H15V10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17ZM12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17,8C17.5523,8 18,7.5523 18,7C18,6.4477 17.5523,6 17,6C16.4477,6 16,6.4477 16,7C16,7.5523 16.4477,8 17,8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2.6327,5.3181C2,6.5844 2,8.2363 2,11.54V12.46C2,15.7637 2,17.4156 2.6327,18.6819C3.2135,19.8442 4.1558,20.7865 5.3181,21.3673C6.5844,22 8.2363,22 11.54,22H12.46C15.7637,22 17.4156,22 18.6819,21.3673C19.8442,20.7865 20.7865,19.8442 21.3673,18.6819C22,17.4156 22,15.7637 22,12.46V11.54C22,8.2363 22,6.5844 21.3673,5.3181C20.7865,4.1558 19.8442,3.2135 18.6819,2.6327C17.4156,2 15.7637,2 12.46,2H11.54C8.2363,2 6.5844,2 5.3181,2.6327C4.1558,3.2135 3.2135,4.1558 2.6327,5.3181ZM12.46,4H11.54C9.8557,4 8.7108,4.0015 7.8252,4.0727C6.9625,4.142 6.5205,4.2677 6.2121,4.4218C5.4372,4.809 4.809,5.4372 4.4218,6.2121C4.2677,6.5205 4.142,6.9625 4.0727,7.8252C4.0015,8.7108 4,9.8557 4,11.54V12.46C4,14.1443 4.0015,15.2892 4.0727,16.1748C4.142,17.0375 4.2677,17.4795 4.4218,17.7879C4.809,18.5628 5.4372,19.191 6.2121,19.5782C6.5205,19.7323 6.9625,19.858 7.8252,19.9273C8.7108,19.9985 9.8557,20 11.54,20H12.46C14.1443,20 15.2892,19.9985 16.1748,19.9273C17.0375,19.858 17.4795,19.7323 17.7879,19.5782C18.5628,19.191 19.191,18.5628 19.5782,17.7879C19.7323,17.4795 19.858,17.0375 19.9273,16.1748C19.9985,15.2892 20,14.1443 20,12.46V11.54C20,9.8557 19.9985,8.7108 19.9273,7.8252C19.858,6.9625 19.7323,6.5205 19.5782,6.2121C19.191,5.4372 18.5628,4.809 17.7879,4.4218C17.4795,4.2677 17.0375,4.142 16.1748,4.0727C15.2892,4.0015 14.1443,4 12.46,4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.4354,13.632C14.5739,13.632 13.8715,12.9621 13.8715,12.1404C13.8715,11.3188 14.5739,10.6489 15.4354,10.6489C16.2969,10.6489 16.9993,11.3188 16.9993,12.1404C16.9993,12.9621 16.2969,13.632 15.4354,13.632ZM15.7115,16.0798C14.643,17.0962 12.5988,17.1763 11.9985,17.1763C11.3982,17.1763 9.351,17.0962 8.2855,16.0798C8.1264,15.9281 8.1264,15.6847 8.2855,15.533C8.4445,15.3813 8.6997,15.3813 8.8588,15.533C9.5311,16.1743 10.9689,16.4033 11.9985,16.4033C13.0251,16.4033 14.4659,16.1743 15.1382,15.533C15.2973,15.3813 15.5525,15.3813 15.7115,15.533C15.8676,15.6847 15.8676,15.9281 15.7115,16.0798ZM6.9917,12.4916C6.9917,11.6699 7.6941,11 8.5556,11C9.4171,11 10.1195,11.6699 10.1195,12.4916C10.1195,13.3132 9.4171,13.9832 8.5556,13.9832C7.6941,13.9832 6.9917,13.3132 6.9917,12.4916ZM22,10.6489C22,9.4951 21.0215,8.5618 19.8118,8.5618C19.2205,8.5618 18.6862,8.7851 18.293,9.1487C16.7981,8.118 14.736,7.4539 12.4397,7.3766L13.4363,2.9018L16.6931,3.5631C16.7321,4.3533 17.4105,4.9832 18.2479,4.9832C19.1124,4.9832 19.8118,4.3161 19.8118,3.4916C19.8118,2.6671 19.1124,2 18.2479,2C17.6326,2 17.1073,2.3407 16.8522,2.8331L13.2142,2.0945C13.1121,2.0744 13.0071,2.0916 12.92,2.146C12.833,2.2004 12.7729,2.2834 12.7519,2.3808L11.6593,7.2907C11.6533,7.3193 11.6593,7.3451 11.6593,7.3737C9.321,7.431 7.2199,8.098 5.701,9.143C5.3078,8.7823 4.7765,8.5618 4.1882,8.5618C2.9785,8.5618 2,9.498 2,10.6489C2,11.4963 2.5313,12.2263 3.2937,12.5527C3.2607,12.7588 3.2427,12.9707 3.2427,13.1854C3.2427,16.3976 7.1628,19 11.9985,19C16.8342,19 20.7543,16.3976 20.7543,13.1854C20.7543,12.9736 20.7363,12.7646 20.7033,12.5584C21.4627,12.2321 22,11.502 22,10.6489Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,17.0606C5.8625,21.0753 19.3825,19.2637 19.8824,7.7766L22,5.9879L19.9294,6.137L21.4824,4.3057L18.9176,5.264C15.4265,2.3951 11.1291,4.8114 11.7412,8.5006C7.9174,8.3545 5.3452,6.7925 3.2706,4.6677C2.9035,5.2297 1.8821,7.0596 4.1647,9.4801L2.5647,9.182C2.7621,12.0168 4.3943,12.1863 5.7176,12.9297L4.3059,13.1C4.3848,14.2608 5.8151,15.5279 7.6941,15.7404C5.5042,17.2246 2.4267,17.4468 2,17.0606V17.0606Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.472,3H6.528C4.5875,3 3,4.5875 3,6.5266V17.4734C3,19.4125 4.5875,21 6.528,21H17.4727C19.4125,21 21,19.4125 21,17.4734V6.5266C21,4.5875 19.4125,3 17.472,3ZM17.631,13.6853C18.7846,14.7562 19.0245,15.2774 19.0635,15.3423C19.5417,16.1351 18.5341,16.1975 18.5341,16.1975L16.608,16.2243C15.3488,16.4727 14.6803,14.0153 13.7188,14.3201C12.9778,14.5552 13.4757,15.5175 13.0801,15.9446C12.8602,16.1793 12.1025,16.0338 11.826,16.0338C8.1905,16.4071 5.9679,11.5348 4.8074,8.8482C4.6729,8.518 4.9347,8.3667 5.2386,8.3683L7.2993,8.3602C7.5237,8.4005 7.7242,8.5235 7.8116,8.7404C7.8116,8.7404 8.1448,9.5834 8.5858,10.3455C9.4467,11.833 9.848,12.1589 10.1398,11.9992C10.6571,11.7169 10.6258,9.4606 10.2233,8.9147C10.0515,8.6804 9.7272,8.6115 9.5837,8.5928C9.467,8.5774 9.6575,8.3083 9.9047,8.1875C10.6532,7.8214 11.9147,7.9104 12.7169,8.104C14.1473,8.4482 12.3974,11.301 13.4619,11.9895C13.6199,12.0916 14.0066,12.0049 14.9713,10.3649C15.4293,9.5875 15.7722,8.6739 15.7722,8.6739C15.8602,8.4837 16.0295,8.3627 16.244,8.3918C16.6438,8.3892 18.9771,8.0546 19.1705,8.5944C19.2815,8.9033 18.9265,9.624 18.0404,10.8051C16.5845,12.745 16.4232,12.5642 17.631,13.6853Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,12V10H9V12H7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,10V12H13V10H11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,17V15H13V17H11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M15,15V17H17V15H15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,1H6V3H5C3.8954,3 3,3.8954 3,5V19C3,20.1046 3.8954,21 5,21H19C20.1046,21 21,20.1046 21,19V5C21,3.8954 20.1046,3 19,3H18V1H16V3H8V1ZM19,8H5V19H19V8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.5,4H8.5L13,16H11L9.87,13H5.12L4,16H2L6.5,4ZM7.5,6.67L5.88,11H9.12L7.5,6.67Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22,8H14V10H19.5L14,18V20H22V18H16.5L22,10V8Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,6V10C3,11.6569 4.3432,13 6,13H10.2676C10.0974,12.7058 10,12.3643 10,12C10,11.6357 10.0974,11.2942 10.2676,11H6C5.4477,11 5,10.5523 5,10V6H3Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M13.7324,11C13.9026,11.2942 14,11.6357 14,12C14,12.3643 13.9026,12.7058 13.7324,13H18C18.5523,13 19,13.4477 19,14V18H21V14C21,12.3431 19.6569,11 18,11H13.7324Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,7C5.6568,7 7,5.6568 7,4C7,2.3431 5.6568,1 4,1C2.3431,1 1,2.3431 1,4C1,5.6568 2.3431,7 4,7ZM4,5C4.5523,5 5,4.5523 5,4C5,3.4477 4.5523,3 4,3C3.4477,3 3,3.4477 3,4C3,4.5523 3.4477,5 4,5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15ZM12,13C12.5523,13 13,12.5523 13,12C13,11.4477 12.5523,11 12,11C11.4477,11 11,11.4477 11,12C11,12.5523 11.4477,13 12,13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M23,20C23,21.6569 21.6569,23 20,23C18.3431,23 17,21.6569 17,20C17,18.3431 18.3431,17 20,17C21.6569,17 23,18.3431 23,20ZM21,20C21,20.5523 20.5523,21 20,21C19.4477,21 19,20.5523 19,20C19,19.4477 19.4477,19 20,19C20.5523,19 21,19.4477 21,20Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4H15V6H4V4Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,8H12V10H4V8Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M20,20H9V18H20V20Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M20,16H12V14H20V16Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M18,12L21,8H19V4H17V8H15L18,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6,12L3,16H5V20H7V16H9L6,12Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0H24V24H0V0Z M 0,0"/>
+    <path
+        android:pathData="M2 16C2.00003 14.7001 2.56466 12.1541 4.12771 9.95421C5.65628 7.80288 8.12033 6 12.0001 6C15.8798 6 18.3438 7.80288 19.8724 9.95421C21.4355 12.1541 22.0001 14.7002 22.0001 16V18H19.0001V20H24.0001V16C24.0001 14.2998 23.3147 11.3459 21.5028 8.7958C19.6563 6.19712 16.6204 4 12.0001 4C7.37972 4 4.34377 6.19712 2.49735 8.79579C0.68541 11.3459 3.05772e-05 14.2998 0 16L7.19428e-05 20H5.00005V18H2.00004L2 16Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M14 18C14 17.2597 13.5978 16.6134 13 16.2676V10H11V16.2676C10.4022 16.6134 10 17.2597 10 18C10 19.1046 10.8954 20 12 20C13.1046 20 14 19.1046 14 18Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M3,9.5C3,8.9713 3.2675,7.8119 4.0518,6.8001C4.7982,5.8371 6.0153,5 8,5C9.9847,5 11.2018,5.8371 11.9483,6.8001C12.7326,7.812 13,8.9713 13,9.5V11H11V13H15V9.5C15,8.5287 14.5856,6.938 13.529,5.5749C12.4346,4.1629 10.6517,3 8,3C5.3484,3 3.5655,4.1629 2.471,5.5749C1.4144,6.938 1,8.5287 1,9.5L1,13H5V11H3L3,9.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M7,8V13H9V8H7Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,20C16.4183,20 20,16.4183 20,12C20,7.5817 16.4183,4 12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20ZM12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M10,8C8.3432,8 7,9.3432 7,11V14C7,15.1046 7.8954,16 9,16H10C11.1046,16 12,15.1046 12,14V13.5C12,14.8807 13.1193,16 14.5,16C15.8807,16 17,14.8807 17,13.5V10.5C17,9.1193 15.8807,8 14.5,8C13.1193,8 12,9.1193 12,10.5V13C12,11.8954 11.1046,11 10,11H9C9,10.4477 9.4477,10 10,10H11V8H10ZM9,14V13H10V14H9ZM14.5,14C14.2239,14 14,13.7761 14,13.5V10.5C14,10.2239 14.2239,10 14.5,10C14.7761,10 15,10.2239 15,10.5V13.5C15,13.7761 14.7761,14 14.5,14Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,15C5.3062,15 6.4175,14.1652 6.8293,13H17.1707C17.5825,14.1652 18.6938,15 20,15C21.6569,15 23,13.6569 23,12C23,10.3431 21.6569,9 20,9C18.6938,9 17.5825,9.8348 17.1707,11H6.8293C6.4175,9.8348 5.3062,9 4,9C2.3431,9 1,10.3431 1,12C1,13.6569 2.3431,15 4,15ZM4,11C3.4477,11 3,11.4477 3,12C3,12.5523 3.4477,13 4,13C4.5523,13 5,12.5523 5,12C5,11.4477 4.5523,11 4,11ZM19,12C19,11.4477 19.4477,11 20,11C20.5523,11 21,11.4477 21,12C21,12.5523 20.5523,13 20,13C19.4477,13 19,12.5523 19,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,19L20.1778,21.7259C20.5823,21.8608 21,21.5597 21,21.1334C21,21.0454 20.9814,20.9585 20.9455,20.8783L12.7042,2.4564C12.58,2.1788 12.3042,2 12,2V19Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M12,2C11.6958,2 11.42,2.1788 11.2958,2.4564L3.0545,20.8783C3.0186,20.9585 3,21.0454 3,21.1334C3,21.5597 3.4177,21.8608 3.8222,21.7259L12,19V2Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,11H16V13H18V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,15H16V17H18V15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,3H12V7H22V21H2V3ZM10,19V17H8V19H10ZM10,15V13H8V15H10ZM10,11V9H8V11H10ZM10,7V5H8V7H10ZM12,19H20V9H12V11H14V13H12V15H14V17H12V19ZM4,5H6V7H4V5ZM6,9H4V11H6V9ZM6,13H4V15H6V13ZM6,17H4V19H6V17Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="24dp"
+    android:viewportWidth="30"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,11.5C22,16.2778 18.8098,20.308 14.4448,21.5812L12.5604,23.5475C12.2834,23.8366 11.9004,24 11.5,24C11.0996,24 10.7166,23.8366 10.4396,23.5475L8.5552,21.5812C4.1902,20.308 1,16.2778 1,11.5C1,5.701 5.701,1 11.5,1C17.299,1 22,5.701 22,11.5ZM16,11.5C16,13.9853 13.9853,16 11.5,16C9.0147,16 7,13.9853 7,11.5C7,9.0147 9.0147,7 11.5,7C13.9853,7 16,9.0147 16,11.5Z"
+      android:fillColor="#B24100"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21,11.5C21,15.913 17.9911,19.6231 13.9129,20.6909L11.8384,22.8556C11.75,22.9478 11.6278,23 11.5,23C11.3722,23 11.25,22.9478 11.1616,22.8556L9.0871,20.6909C5.0089,19.6231 2,15.913 2,11.5C2,6.2533 6.2533,2 11.5,2C16.7467,2 21,6.2533 21,11.5ZM11.5,17C14.5376,17 17,14.5376 17,11.5C17,8.4624 14.5376,6 11.5,6C8.4624,6 6,8.4624 6,11.5C6,14.5376 8.4624,17 11.5,17Z"
+      android:fillColor="#FFA600"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15,15C12.7909,15 11,16.7909 11,19C11,21.2091 12.7909,23 15,23H26C28.2091,23 30,21.2091 30,19C30,16.7909 28.2091,15 26,15H15Z"
+      android:fillColor="#206FE6"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M26,16H15C13.3431,16 12,17.3431 12,19C12,20.6569 13.3431,22 15,22H26C27.6569,22 29,20.6569 29,19C29,17.3431 27.6569,16 26,16Z"
+      android:fillColor="#0C90F8"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15,17H14V21H17V20H15V17Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19,17H18V21H19V17Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19.5,17H20.5L21.5,19.6667L22.5,17H23.5L22,21H21L19.5,17Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M24,17H27V18H25V18.5H27V19.5H25V20H27V21H24V17Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,12L20,9V4H15L12,1L9,4H4V9L1,12L4,15V20H9L12,23L15,20H20V15L23,12ZM13,12C13,14.4215 11.5655,16.5079 9.5,17.456C10.2611,17.8053 11.1078,18 12,18C15.3137,18 18,15.3137 18,12C18,8.6863 15.3137,6 12,6C11.1078,6 10.2611,6.1947 9.5,6.544C11.5655,7.4921 13,9.5785 13,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,14H7V22H5V14Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M11,8V6H13V8H11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,8H9V10H11V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,8H15V10H13V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19,2H5V14H19V2ZM7,4H9V6H7V4ZM11,6H9V8H7V10H9V12H11V10H13V12H15V10H17V8H15V6H17V4H15V6H13V4H11V6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,9.6667L12.875,12H11.125L12,9.6667Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,4C3,2.8954 3.8954,2 5,2H19C20.1046,2 21,2.8954 21,4V18C21,19.1046 20.1046,20 19,20H15L12,23L9,20H5C3.8954,20 3,19.1046 3,18V4ZM13,7L16,15H14L13.625,14H10.375L10,15H8L11,7H13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,8V13.5352L14.4453,15.8321L15.5547,14.1679L13,12.4648V8H11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,1H15V3H9V1Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,12L11,18H13V12H11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,22C16.9706,22 21,17.9706 21,13C21,8.0294 16.9706,4 12,4C7.0294,4 3,8.0294 3,13C3,17.9706 7.0294,22 12,22ZM12,20C15.866,20 19,16.866 19,13C19,9.134 15.866,6 12,6C8.134,6 5,9.134 5,13C5,16.866 8.134,20 12,20Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6,0H10V2H6V0Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M7,9V12H9V9H7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,9C14,12.3137 11.3137,15 8,15C4.6863,15 2,12.3137 2,9C2,5.6863 4.6863,3 8,3C11.3137,3 14,5.6863 14,9ZM8,13C10.2091,13 12,11.2091 12,9C12,6.7909 10.2091,5 8,5C5.7909,5 4,6.7909 4,9C4,11.2091 5.7909,13 8,13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6,0H10V2H6V0Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,12C6.3432,12 5,10.6569 5,9H8V6C9.6568,6 11,7.3432 11,9C11,10.6569 9.6568,12 8,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,9C14,12.3137 11.3137,15 8,15C4.6863,15 2,12.3137 2,9C2,5.6863 4.6863,3 8,3C11.3137,3 14,5.6863 14,9ZM8,13C10.2091,13 12,11.2091 12,9C12,6.7909 10.2091,5 8,5C5.7909,5 4,6.7909 4,9C4,11.2091 5.7909,13 8,13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,1H15V3H9V1Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M15.5355,16.5355C14.5979,17.4732 13.3261,18 12,18L12,8C13.3261,8 14.5979,8.5268 15.5355,9.4645C16.4732,10.4021 17,11.6739 17,13C17,14.3261 16.4732,15.5979 15.5355,16.5355Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,22C16.9706,22 21,17.9706 21,13C21,8.0294 16.9706,4 12,4C7.0294,4 3,8.0294 3,13C3,17.9706 7.0294,22 12,22ZM12,20C15.866,20 19,16.866 19,13C19,9.134 15.866,6 12,6C8.134,6 5,9.134 5,13C5,16.866 8.134,20 12,20Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6,0H10V2H6V0ZM8,13C10.2091,13 12,11.2091 12,9C12,6.7909 10.2091,5 8,5C5.7909,5 4,6.7909 4,9C4,11.2091 5.7909,13 8,13ZM14,9C14,12.3137 11.3137,15 8,15C4.6863,15 2,12.3137 2,9C2,5.6863 4.6863,3 8,3C11.3137,3 14,5.6863 14,9ZM11,9C11,10.6569 9.6568,12 8,12V6C9.6568,6 11,7.3432 11,9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,1H15V3H9V1Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,8L11,14H13V8H11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,22C16.9706,22 21,17.9706 21,13C21,8.0294 16.9706,4 12,4C7.0294,4 3,8.0294 3,13C3,17.9706 7.0294,22 12,22ZM12,20C15.866,20 19,16.866 19,13C19,9.134 15.866,6 12,6C8.134,6 5,9.134 5,13C5,16.866 8.134,20 12,20Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6,0H10V2H6V0Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M7,6V9H9V6H7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,9C14,12.3137 11.3137,15 8,15C4.6863,15 2,12.3137 2,9C2,5.6863 4.6863,3 8,3C11.3137,3 14,5.6863 14,9ZM8,13C10.2091,13 12,11.2091 12,9C12,6.7909 10.2091,5 8,5C5.7909,5 4,6.7909 4,9C4,11.2091 5.7909,13 8,13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.6622,21.2089C10.2527,21.7111 10,22 10,22C10,22 3,14 3,9C3,5 6.134,2 10,2C13.866,2 17,5 17,9C17,9.0055 17,9.0109 17,9.0164C16.8347,9.0055 16.668,9 16.5,9C12.3579,9 9,12.3579 9,16.5C9,18.2835 9.6226,19.9216 10.6622,21.2089ZM12,9C12,10.1046 11.1046,11 10,11C8.8954,11 8,10.1046 8,9C8,7.8954 8.8954,7 10,7C11.1046,7 12,7.8954 12,9Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M16.5,22C19.5376,22 22,19.5376 22,16.5C22,13.4624 19.5376,11 16.5,11C13.4624,11 11,13.4624 11,16.5C11,19.5376 13.4624,22 16.5,22ZM15.5,14V17.4402L17.8874,19.2904L19.1126,17.7096L17.5,16.4599V14H15.5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M5,6.7324C5.5978,6.3866 6,5.7403 6,5C6,3.8954 5.1046,3 4,3C2.8954,3 2,3.8954 2,5C2,5.7403 2.4022,6.3866 3,6.7324V11C3,12.6569 4.3432,14 6,14C7.6568,14 9,12.6569 9,11V6C9,5.4477 9.4477,5 10,5C10.5523,5 11,5.4477 11,6V10.2676C10.4022,10.6134 10,11.2597 10,12C10,13.1046 10.8954,14 12,14C13.1046,14 14,13.1046 14,12C14,11.2597 13.5978,10.6134 13,10.2676V6C13,4.3432 11.6569,3 10,3C8.3432,3 7,4.3432 7,6V11C7,11.5523 6.5523,12 6,12C5.4477,12 5,11.5523 5,11V6.7324Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4.7147,6.7147L3,5H8V10L6.1518,8.1518C5.4237,9.2559 5,10.5785 5,12C5,14.5908 6.4074,16.8528 8.4994,18.0632C8.1812,18.637 8,19.2974 8,20C8,20.0217 8.0002,20.0432 8.0005,20.0648C5.0368,18.5922 3,15.534 3,12C3,10.0251 3.6361,8.1987 4.7147,6.7147Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M15.5006,5.9369C15.8188,5.363 16,4.7027 16,4C16,3.9784 15.9998,3.9568 15.9995,3.9353C17.7584,4.8092 19.1908,6.2417 20.0647,8.0006C20.0432,8.0002 20.0216,8 20,8C19.2973,8 18.637,8.1812 18.0632,8.4994C17.4486,7.4372 16.5628,6.5515 15.5006,5.9369Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M15.5006,18.0632C15.8188,18.637 16,19.2974 16,20C16,20.0217 15.9998,20.0432 15.9995,20.0648C17.7584,19.1908 19.1908,17.7584 20.0647,15.9995C20.0432,15.9999 20.0216,16 20,16C19.2973,16 18.637,15.8189 18.0632,15.5007C17.4486,16.5629 16.5628,17.4486 15.5006,18.0632Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M12,7C13.6569,7 15,5.6568 15,4C15,2.3431 13.6569,1 12,1C10.3431,1 9,2.3431 9,4C9,5.6568 10.3431,7 12,7ZM12,5C12.5523,5 13,4.5523 13,4C13,3.4477 12.5523,3 12,3C11.4477,3 11,3.4477 11,4C11,4.5523 11.4477,5 12,5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M20,15C21.6569,15 23,13.6569 23,12C23,10.3431 21.6569,9 20,9C18.3431,9 17,10.3431 17,12C17,13.6569 18.3431,15 20,15ZM20,13C20.5523,13 21,12.5523 21,12C21,11.4477 20.5523,11 20,11C19.4477,11 19,11.4477 19,12C19,12.5523 19.4477,13 20,13Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M15,20C15,21.6569 13.6569,23 12,23C10.3431,23 9,21.6569 9,20C9,18.3431 10.3431,17 12,17C13.6569,17 15,18.3431 15,20ZM13,20C13,20.5523 12.5523,21 12,21C11.4477,21 11,20.5523 11,20C11,19.4477 11.4477,19 12,19C12.5523,19 13,19.4477 13,20Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,0H2V24H22V0ZM20,2H4V22H20V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M12,16.9L7,18.65L6.5771,18.798C6.2951,18.8967 6,18.6874 6,18.3886C6,18.3301 6.0118,18.2723 6.0347,18.2185L11.536,5.3067C11.6152,5.1207 11.7979,5 12,5C12.2021,5 12.3848,5.1207 12.464,5.3067L17.9653,18.2185C17.9882,18.2723 18,18.3301 18,18.3886C18,18.6874 17.7049,18.8967 17.4229,18.798L17,18.65L12,16.9Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#727272"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,7C12.5523,7 13,7.4477 13,8V11H16C16.5523,11 17,11.4477 17,12C17,12.5523 16.5523,13 16,13H13V16C13,16.5523 12.5523,17 12,17C11.4477,17 11,16.5523 11,16V13H8C7.4477,13 7,12.5523 7,12C7,11.4477 7.4477,11 8,11H11V8C11,7.4477 11.4477,7 12,7Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:strokeAlpha="0.1"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M8,4C8.5523,4 9,4.4477 9,5V7H11C11.5523,7 12,7.4477 12,8C12,8.5523 11.5523,9 11,9H9V11C9,11.5523 8.5523,12 8,12C7.4477,12 7,11.5523 7,11V9H5C4.4477,9 4,8.5523 4,8C4,7.4477 4.4477,7 5,7H7V5C7,4.4477 7.4477,4 8,4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#727272"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.7071,9.2929C17.0976,9.6834 17.0976,10.3166 16.7071,10.7071L11.7071,15.7071C11.3166,16.0976 10.6834,16.0976 10.2929,15.7071L7.2929,12.7071C6.9024,12.3166 6.9024,11.6834 7.2929,11.2929C7.6834,10.9024 8.3166,10.9024 8.7071,11.2929L11,13.5858L15.2929,9.2929C15.6834,8.9024 16.3166,8.9024 16.7071,9.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#727272"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.2929,7.2929C7.6834,6.9024 8.3166,6.9024 8.7071,7.2929L12,10.5858L15.2929,7.2929C15.6834,6.9024 16.3166,6.9024 16.7071,7.2929C17.0976,7.6834 17.0976,8.3166 16.7071,8.7071L13.4142,12L16.7071,15.2929C17.0976,15.6834 17.0976,16.3166 16.7071,16.7071C16.3166,17.0976 15.6834,17.0976 15.2929,16.7071L12,13.4142L8.7071,16.7071C8.3166,17.0976 7.6834,17.0976 7.2929,16.7071C6.9024,16.3166 6.9024,15.6834 7.2929,15.2929L10.5858,12L7.2929,8.7071C6.9024,8.3166 6.9024,7.6834 7.2929,7.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:strokeAlpha="0.1"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M6,3H10V4H12V5H4V4H6V3Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,6H5V12C5,12.5523 5.4477,13 6,13H10C10.5523,13 11,12.5523 11,12V6Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,15h10v2h-10z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#727272"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#727272"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.7929,12.2071L11.7929,9.2071L7,14V17H10L14.7929,12.2071Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13.2071,7.7929L14.2929,6.7071C14.6834,6.3165 15.3166,6.3165 15.7071,6.7071L17.2929,8.2929C17.6834,8.6834 17.6834,9.3166 17.2929,9.7071L16.2071,10.7929L13.2071,7.7929Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,8m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:strokeAlpha="0.1"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M10.2929,7.7071L8.2929,5.7071L4,10V12H6L10.2929,7.7071Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9.7071,4.2929L11,3L13,5L11.7071,6.2929L9.7071,4.2929Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,16C10.5195,16 9.2268,15.1956 8.5351,14L6.3414,14C7.1651,16.3304 9.3876,18 12,18C15.3137,18 18,15.3137 18,12C18,8.6863 15.3137,6 12,6C10.0883,6 8.3855,6.894 7.2867,8.2868L6,7L6,11L10,11L8.7159,9.7159C9.4386,8.6787 10.64,8 12,8C14.2092,8 16,9.7909 16,12C16,14.2091 14.2092,16 12,16Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7.1556,12.1556L11,16L2,16V7L5.7378,10.7378C7.6752,9.0336 10.2169,8 13,8C17.4655,8 21.3095,10.6608 23.033,14.4835L21.2419,15.379C19.8484,12.2116 16.6824,10 13,10C10.7693,10 8.7281,10.8116 7.1556,12.1556Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M24,19L24,19.0217V18.9783L24,19Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,3H10V15H6L12,21L18,15H14V3Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,4H7V10H9L6,13L3,10H5V4Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M17,4H19V10H21L18,13L15,10H17V4Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2ZM14,12V16H10V12H7L12,7L17,12H14Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12C14.2091,12 16,10.2091 16,8C16,5.7909 14.2091,4 12,4C9.7909,4 8,5.7909 8,8C8,10.2091 9.7909,12 12,12ZM9.4768,14.5046C7.8476,14.8305 6.2887,15.4742 4.9063,16.3958C4.3401,16.7733 4,17.4087 4,18.0892V20H20V18.0892C20,17.4087 19.6599,16.7733 19.0937,16.3958C17.7113,15.4742 16.1524,14.8305 14.5232,14.5046C12.8638,14.1728 11.1362,14.1728 9.4768,14.5046Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,15C13.6569,15 15,13.6569 15,12C15,10.3431 13.6569,9 12,9C10.3431,9 9,10.3431 9,12C9,13.6569 10.3431,15 12,15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M0,12C0,12 4.8,5 12,5C19.2,5 24,12 24,12C24,12 19.2,19 12,19C4.8,19 0,12 0,12ZM17,12C17,14.7614 14.7614,17 12,17C9.2386,17 7,14.7614 7,12C7,9.2386 9.2386,7 12,7C14.7614,7 17,9.2386 17,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.5,12C16.5,10.23 15.48,8.71 14,7.97V10.18L16.45,12.63C16.48,12.43 16.5,12.22 16.5,12V12ZM19,12C19,12.94 18.8,13.82 18.46,14.64L19.97,16.15C20.63,14.91 21,13.5 21,12C21,7.72 18.01,4.14 14,3.23V5.29C16.89,6.15 19,8.83 19,12ZM4.27,3L3,4.27L7.73,9H3V15H7L12,20V13.27L16.25,17.52C15.58,18.04 14.83,18.45 14,18.7V20.76C15.38,20.45 16.63,19.81 17.69,18.95L19.73,21L21,19.73L12,10.73L4.27,3ZM12,4L9.91,6.09L12,8.18V4Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,9V15H7L12,20V4L7,9H3ZM16.5,12C16.5,10.23 15.48,8.71 14,7.97V16.02C15.48,15.29 16.5,13.77 16.5,12ZM14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.85 14,18.71V20.77C18.01,19.86 21,16.28 21,12C21,7.72 18.01,4.14 14,3.23V3.23Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,16h12v2h-12z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M8,4H16V6H13V13H11L11,6H8V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,14C4.4477,14 4,14.4477 4,15V19C4,19.5523 4.4477,20 5,20H6C6.5523,20 7,19.5523 7,19V15C7,14.4477 6.5523,14 6,14H5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,15C11.4477,15 11,15.4477 11,16V18C11,18.5523 11.4477,19 12,19C12.5523,19 13,18.5523 13,18V16C13,15.4477 12.5523,15 12,15Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M17,15C17,14.4477 17.4477,14 18,14H19C19.5523,14 20,14.4477 20,15V19C20,19.5523 19.5523,20 19,20H18C17.4477,20 17,19.5523 17,19V15Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,3C2.4477,3 2,3.4477 2,4V14C2,14.5523 2.4477,15 3,15H21C21.5523,15 22,14.5523 22,14V4C22,3.4477 21.5523,3 21,3H3Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,17V19.5C2,20.6046 2.8954,21.5 4,21.5H20C21.1046,21.5 22,20.6046 22,19.5V17H20V19.5H4V17H2Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,18L6,12L2,6V18Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10,12L9,8H7L9,16H11L12,12L13,16H15L17,8H15L14,12L13,8H11L10,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,12L22,18V6L18,12Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.9627,17.3768L17.7929,19.2071L19.2071,17.7928L3.2071,1.7929L1.7929,3.2071L3.5341,4.9482C0.9888,6.352 0,7.9999 0,7.9999L12,22L15.9627,17.3768Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M24,7.9999L18.9791,13.8577L8.4132,3.2919C9.4857,3.1078 10.6781,2.9999 12,2.9999C21,2.9999 24,7.9999 24,7.9999Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M10,8H4V10H6.0699L11.9545,23.9091H13.0909L16.1685,17.7538L18.7727,23.9091H19.909L26.8636,10H28.9999V8H23.9999V10H25.159L19.909,20.5L17.6363,14.8182L20.0455,10H22V8H18V10H18.3409L16.8788,12.9243L15.709,10H15.9999V8H10.9999V10H12.8881L15.3873,15.9073L13.0909,20.5L8.8909,10H10V8Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM12.037,19.9999C12.0246,20 12.0123,20 12,20C11.9876,20 11.9752,20 11.9628,19.9999C11.2303,19.1759 10.2715,17.8425 9.6459,16H14.3539C13.7282,17.8426 12.7694,19.1759 12.037,19.9999ZM9.3234,19.5413C8.6729,18.758 7.9755,17.6132 7.5163,16H5.0702C6.015,17.6331 7.5204,18.9013 9.3234,19.5413ZM4.252,14H7.1176C7.042,13.3838 6.9999,12.7182 6.9999,12C6.9999,11.2817 7.042,10.6162 7.1176,10H4.252C4.0875,10.6392 4,11.3094 4,12C4,12.6906 4.0875,13.3607 4.252,14ZM5.0703,8H7.5163C7.9754,6.3868 8.6728,5.242 9.3233,4.4588C7.5204,5.0987 6.015,6.3669 5.0703,8ZM11.9627,4.0001C11.2303,4.8241 10.2715,6.1574 9.6459,8H14.3539C13.7283,6.1574 12.7695,4.8241 12.037,4.0001C12.0247,4 12.0123,4 12,4C11.9876,4 11.9752,4 11.9627,4.0001ZM14.6763,4.4586C15.3269,5.2419 16.0243,6.3867 16.4834,8H18.9297C17.985,6.3668 16.4794,5.0985 14.6763,4.4586ZM14.6762,19.5414C15.3268,18.7581 16.0243,17.6133 16.4834,16H18.9298C17.985,17.6332 16.4794,18.9015 14.6762,19.5414ZM20,12C20,12.6906 19.9125,13.3607 19.748,14H16.8822C16.9578,13.3838 16.9999,12.7182 16.9999,12C16.9999,11.2817 16.9578,10.6162 16.8822,10H19.748C19.9125,10.6392 20,11.3094 20,12ZM14.9999,12C14.9999,12.7085 14.9441,13.3751 14.8457,14H9.154C9.0556,13.3751 8.9999,12.7085 8.9999,12C8.9999,11.2915 9.0556,10.6248 9.154,10H14.8457C14.9441,10.6248 14.9999,11.2915 14.9999,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.2929,19.7071L3.5858,12L11.2929,4.2929L12.7071,5.7071L7.4142,11H20V13H7.4142L12.7071,18.2929L11.2929,19.7071Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.7071,4.2929L20.4142,12L12.7071,19.7071L11.2929,18.2929L16.5858,13H4V11H16.5858L11.2929,5.7071L12.7071,4.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M10.7071,4.2929C10.3166,3.9024 9.6834,3.9024 9.2929,4.2929C8.9024,4.6834 8.9024,5.3166 9.2929,5.7071L10.5858,7H3C2.4477,7 2,7.4477 2,8C2,8.5523 2.4477,9 3,9H10.5858L9.2929,10.2929C8.9024,10.6834 8.9024,11.3166 9.2929,11.7071C9.6834,12.0976 10.3166,12.0976 10.7071,11.7071L13.7065,8.7077C13.7089,8.7053 13.7113,8.7029 13.7136,8.7006C13.8901,8.5208 13.9992,8.2746 14,8.003C14,8.002 14,8.001 14,8C14,7.999 14,7.998 14,7.997C13.9996,7.8625 13.9727,7.7343 13.9241,7.6172C13.8757,7.5001 13.804,7.3904 13.7092,7.295"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M10.7071,4.2929L13.7068,7.2926Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM10,17L5,12.1923L6.4,10.8462L10,14.3077L17.6,7L19,8.3462L10,17Z"
+      android:fillColor="#6B9799"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3ZM10,17L5,12.1923L6.4,10.8462L10,14.3077L17.6,7L19,8.3462L10,17Z"
+      android:fillColor="#009688"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,5V19H5V5H19ZM19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3Z"
+      android:fillColor="#6B9799"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,5V19H5V5H19ZM19,3H5C3.9,3 3,3.9 3,5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V5C21,3.9 20.1,3 19,3Z"
+      android:fillColor="#009688"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="168dp"
+    android:viewportWidth="168"
+    android:viewportHeight="168">
+  <path
+      android:pathData="M84,84m-84,0a84,84 0,1 1,168 0a84,84 0,1 1,-168 0"
+      android:fillColor="#FFC808"/>
+  <path
+      android:pathData="M114,80L84,41L54,80C54,80 57.247,82.474 63.484,84.671C68.462,86.424 75.344,88 84,88C92.656,88 99.538,86.424 104.516,84.671C110.753,82.474 114,80 114,80Z"
+      android:fillColor="#7CB342"/>
+  <path
+      android:pathData="M63.484,84.671L39,116.5C39,116.5 43.384,119.422 51.82,122.184C59.375,124.656 70.181,127 84,127C97.337,127 107.868,124.817 115.378,122.442C124.339,119.608 129,116.5 129,116.5L104.516,84.671C99.538,86.424 92.656,88 84,88C75.344,88 68.462,86.424 63.484,84.671Z"
+      android:fillColor="#7CB342"/>
+  <path
+      android:pathData="M84,168C103.794,168 121.989,161.154 136.346,149.7L115.378,122.442C107.868,124.817 97.337,127 84,127C70.181,127 59.375,124.656 51.82,122.184L31.037,149.202C45.488,160.955 63.921,168 84,168Z"
+      android:fillColor="#7CB342"/>
+  <path
+      android:pathData="M115.378,122.442C107.868,124.817 97.337,127 84,127C70.181,127 59.375,124.656 51.82,122.184L48.789,126.125C56.356,128.941 68.212,132 84,132C99.256,132 110.839,129.144 118.431,126.41L115.378,122.442Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M104.516,84.671C99.538,86.424 92.656,88 84,88C75.344,88 68.462,86.424 63.484,84.671L60.522,88.522C65.567,90.668 73.471,93 84,93C94.529,93 102.433,90.668 107.478,88.522L104.516,84.671Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M87.207,45.169L84,43.346L80.793,45.169L84,41L87.207,45.169Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M84,40.346L90.429,44L88.54,36.97L94,32.308L86.857,31.63L84,25L81.143,31.577L74,32.308L79.46,36.97L77.571,44L84,40.346Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M84,65C86.761,65 89,62.761 89,60C89,57.239 86.761,55 84,55C81.239,55 79,57.239 79,60C79,62.761 81.239,65 84,65Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M94.5,80C95.881,80 97,78.881 97,77.5C97,76.119 95.881,75 94.5,75C93.119,75 92,76.119 92,77.5C92,78.881 93.119,80 94.5,80Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M73,74.5C73,75.881 71.881,77 70.5,77C69.119,77 68,75.881 68,74.5C68,73.119 69.119,72 70.5,72C71.881,72 73,73.119 73,74.5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M85.5,117C86.881,117 88,115.881 88,114.5C88,113.119 86.881,112 85.5,112C84.119,112 83,113.119 83,114.5C83,115.881 84.119,117 85.5,117Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M99,99C99,101.209 97.209,103 95,103C92.791,103 91,101.209 91,99C91,96.791 92.791,95 95,95C97.209,95 99,96.791 99,99Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M108,115C110.209,115 112,113.209 112,111C112,108.791 110.209,107 108,107C105.791,107 104,108.791 104,111C104,113.209 105.791,115 108,115Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M76,96C76,98.209 74.209,100 72,100C69.791,100 68,98.209 68,96C68,93.791 69.791,92 72,92C74.209,92 76,93.791 76,96Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M62,118C65.314,118 68,115.314 68,112C68,108.686 65.314,106 62,106C58.686,106 56,108.686 56,112C56,115.314 58.686,118 62,118Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M60,147C60,150.314 57.314,153 54,153C50.686,153 48,150.314 48,147C48,143.686 50.686,141 54,141C57.314,141 60,143.686 60,147Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M114,150C117.314,150 120,147.314 120,144C120,140.686 117.314,138 114,138C110.686,138 108,140.686 108,144C108,147.314 110.686,150 114,150Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M95,154C95,156.209 93.209,158 91,158C88.791,158 87,156.209 87,154C87,151.791 88.791,150 91,150C93.209,150 95,151.791 95,154Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M76,143C78.209,143 80,141.209 80,139C80,136.791 78.209,135 76,135C73.791,135 72,136.791 72,139C72,141.209 73.791,143 76,143Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60dp"
+    android:height="60dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M50,20H42.975C41.85,18.05 40.3,16.375 38.425,15.1L42.5,11.025L38.975,7.5L33.55,12.925C32.4,12.65 31.225,12.5 30,12.5C28.775,12.5 27.6,12.65 26.475,12.925L21.025,7.5L17.5,11.025L21.55,15.1C19.7,16.375 18.15,18.05 17.025,20H10V25H15.225C15.1,25.825 15,26.65 15,27.5V30H10V35H15V37.5C15,38.35 15.1,39.175 15.225,40H10V45H17.025C19.625,49.475 24.45,52.5 30,52.5C35.55,52.5 40.375,49.475 42.975,45H50V40H44.775C44.9,39.175 45,38.35 45,37.5V35H50V30H45V27.5C45,26.65 44.9,25.825 44.775,25H50V20ZM35,40H25V35H35V40ZM35,30H25V25H35V30Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="14"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M3.4386,10H3.4036C3.1807,10 3,9.8193 3,9.5964C3,9.533 3.0149,9.4705 3.0436,9.414L6.7096,2.1784C6.765,2.069 6.8773,2 7,2C7.1227,2 7.2349,2.069 7.2904,2.1784L10.9564,9.414C10.9851,9.4705 11,9.533 11,9.5964C11,9.8193 10.8193,10 10.5964,10H10.5614C10.5207,10 10.4801,9.9943 10.4409,9.9831L7,9L3.5591,9.9831C3.5199,9.9943 3.4793,10 3.4386,10Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="4dp"
+    android:height="4dp"
+    android:viewportWidth="4"
+    android:viewportHeight="4">
+  <path
+      android:pathData="M2,2m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
+  <path
+      android:pathData="M22.4602,19.657C22.1406,20.0724 21.9998,20.6274 21.9998,21.0003L17.9998,20.9997C18.0003,17.664 20.6679,15 24,15C27.7648,15 30,18.0628 30,21C30,23.3929 28.4365,25.1506 27.317,26.1301C26.8497,26.5391 26.3881,26.8754 26,27.1335V28H22V24.7639C23.3804,24.0734 26,22.8666 26,21C26,19.9372 25.2352,19 24,19C23.139,19 22.7178,19.3221 22.4602,19.657Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M21.9999,29H25.9999V33H21.9999V29Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M24,43C28.1641,43 32.0152,41.6605 35.1462,39.3888L47.3787,51.6213L51.6213,47.3787L39.3888,35.1462C41.6605,32.0152 43,28.1641 43,24C43,13.5066 34.4934,5 24,5C13.5066,5 5,13.5066 5,24C5,34.4934 13.5066,43 24,43ZM24,37C31.1797,37 37,31.1797 37,24C37,16.8203 31.1797,11 24,11C16.8203,11 11,16.8203 11,24C11,31.1797 16.8203,37 24,37Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.5,1C9.1193,1 8,2.1193 8,3.5V5H4C2.8954,5 2,5.8954 2,7V11H3.5C4.8807,11 6,12.1193 6,13.5C6,14.8807 4.8807,16 3.5,16H2V20C2,21.1046 2.8954,22 4,22H8V20.5C8,19.1193 9.1193,18 10.5,18C11.8807,18 13,19.1193 13,20.5V22H17C18.1046,22 19,21.1046 19,20V16H20.5C21.8807,16 23,14.8807 23,13.5C23,12.1193 21.8807,11 20.5,11H19V7C19,5.8954 18.1046,5 17,5H13V3.5C13,2.1193 11.8807,1 10.5,1Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,4H2V6H18V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,4H20V6H22V4Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,9H18V11H2V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,9H20V11H22V9Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,14H18V16H2V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,14H20V16H22V14Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2,19H18V21H2V19Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M22,19H20V21H22V19Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,8C11,9.6568 9.6568,11 8,11C6.3432,11 5,9.6568 5,8C5,6.3432 6.3432,5 8,5C9.6568,5 11,6.3432 11,8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,13C12.0833,13 15,15.4 15,17.2V19H1V17.2C1,15.4 3.9167,13 8,13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,11C14.3431,11 13,9.6568 13,8C13,6.3432 14.3431,5 16,5C17.6569,5 19,6.3432 19,8C19,9.6568 17.6569,11 16,11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M17,17.2C17,15.8828 15.4381,14.2442 13,13.4601C13.8936,13.1726 14.9048,13 16,13C20.0833,13 23,15.4 23,17.2V19H17V17.2Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,6C2,4.8954 2.8954,4 4,4H10L12,6H20C21.1046,6 22,6.8954 22,8V18C22,19.1046 21.1046,20 20,20H4C2.8954,20 2,19.1046 2,18V6ZM11,9H14V11H13V15C13,16.1046 12.1046,17 11,17C9.8954,17 9,16.1046 9,15C9,13.8954 9.8954,13 11,13V9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M22,6C22,4.8954 21.1046,4 20,4H14L12,6H2V8H22V6Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+      android:fillColor="#3DB878"/>
+  <path
+      android:pathData="M8.4083,14.43C7.9343,14.5756 7.8656,15.1463 8.2412,15.366C8.3755,15.4445 13.9178,18.6119 14.1437,18.7404C14.3697,18.8688 14.6387,18.7963 14.7756,18.5787C14.8547,18.4531 15.0725,18.0663 15.2426,17.7615C15.3674,17.538 15.2489,17.2226 15.0359,17.1133C14.8229,17.004 12.7582,15.8093 12.6624,15.76C12.2038,15.5238 12.3689,14.9628 12.7086,14.8415L14.4288,14.227C14.6017,14.1653 14.7496,14.0063 14.808,13.8216L15.3795,12.0135C15.5534,11.4634 16.0708,11.594 16.2425,11.9344C16.586,12.6153 17.4286,14.2193 17.5379,14.4679C17.7982,15.0596 18.5259,14.414 18.8614,14.1886C19.0943,14.0322 19.1605,13.761 19.0577,13.5161C18.987,13.3477 17.5667,10.5623 16.6622,8.7885C16.2522,7.9844 15.9482,7.3882 15.924,7.3379C15.7052,6.8838 15.1685,6.8855 15.0202,7.3546L13.4353,12.3687C13.3755,12.5578 13.2366,12.706 13.0586,12.7704C12.0716,13.1277 8.81,14.3067 8.4083,14.43Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M23.2601,23.9293C23.0374,23.7998 15.9805,19.773 15.6895,19.6127C15.3984,19.4524 15.3275,19.177 15.4833,18.8784C15.5624,18.7265 15.7341,18.4237 15.874,18.1796C16.0665,17.8439 16.3469,17.8429 16.5052,17.9424C16.6635,18.0419 18.9039,19.3126 19.0487,19.3986C19.3909,19.6018 19.8954,19.1366 19.6691,18.7291C19.561,18.5344 18.6168,16.6771 18.3169,16.0649C18.1804,15.7864 18.2177,15.5359 18.5219,15.3692C18.6725,15.2867 18.9418,15.1145 19.1755,14.9616C19.4141,14.8054 19.7316,14.9228 19.8607,15.1554C19.9898,15.388 23.8121,22.9834 23.9341,23.2192C24.1763,23.6874 23.7053,24.1881 23.2601,23.9293Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,8C13.1,8 14,7.1 14,6C14,4.9 13.1,4 12,4C10.9,4 10,4.9 10,6C10,7.1 10.9,8 12,8ZM12,10C10.9,10 10,10.9 10,12C10,13.1 10.9,14 12,14C13.1,14 14,13.1 14,12C14,10.9 13.1,10 12,10ZM12,16C10.9,16 10,16.9 10,18C10,19.1 10.9,20 12,20C13.1,20 14,19.1 14,18C14,16.9 13.1,16 12,16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,5H6V19H10V5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,5H14V19H18V5Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,4L19,12L6,20V4Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,6C13.1046,6 14,5.1046 14,4C14,2.8954 13.1046,2 12,2C10.8954,2 10,2.8954 10,4C10,5.1046 10.8954,6 12,6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,9V7H21V9H15V22H13V16H11V22H9V9H3Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3V7H7V5H17V7H19V3C19,1.9 18.1,1.01 17,1.01Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M5,21V17H7V19H17V17H19V21C19,22.1 18.1,23 17,23H7C5.9,23 5,22.1 5,21Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8.2929,7.2929L9.7071,8.7071L6.4142,12L9.7071,15.2929L8.2929,16.7071L3.5858,12L8.2929,7.2929Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M15.7071,7.2929L14.2929,8.7071L17.5858,12L14.2929,15.2929L15.7071,16.7071L20.4142,12L15.7071,7.2929Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,21C18.61,21 17.22,20.53 16,19.68C13.56,21.39 10.44,21.39 8,19.68C6.78,20.53 5.39,21 4,21H2V23H4C5.38,23 6.74,22.65 8,22.01C10.52,23.3 13.48,23.3 16,22.01C17.26,22.66 18.62,23 20,23H22V21H20ZM3.95,19H4C5.6,19 7.02,18.12 8,17C8.98,18.12 10.4,19 12,19C13.6,19 15.02,18.12 16,17C16.98,18.12 18.4,19 20,19H20.05L21.94,12.32C22.02,12.06 22,11.78 21.88,11.54C21.76,11.3 21.54,11.12 21.28,11.04L20,10.62V6C20,4.9 19.1,4 18,4H15V1H9V4H6C4.9,4 4,4.9 4,6V10.62L2.71,11.04C2.45,11.12 2.23,11.3 2.11,11.54C1.99,11.78 1.96,12.06 2.05,12.32L3.95,19ZM6,6H18V9.97L12,8L6,9.97V6Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,5H1V6H2.5L8,19H9L11.7083,13.5833L14,19H15L21.5,6H23V5H19V6H20L15,16L13,11L15.5,6H17V5H13V6H14L12.3333,9.3333L11,6H12V5H7V6H8.5L11.0208,11.9583L9,16L5,6H6V5Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,5H9V9H11V5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,5H12V9H14V5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M15,5H17V9H15V5Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,1L4,7V21C4,22.1046 4.8954,23 6,23H19C20.1046,23 21,22.1046 21,21V3C21,1.8954 20.1046,1 19,1H8ZM19,3V21H6L6,7.6055L9.0704,3H19Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M3.143,6.6424C3.0485,6.8786 3,7.1307 3,7.3852V13C3,13.5523 3.4477,14 4,14H12C12.5523,14 13,13.5523 13,13V3C13,2.4477 12.5523,2 12,2H5.677C5.2681,2 4.9004,2.249 4.7486,2.6286L3.143,6.6424ZM7,3H6V7H7V3ZM9,3H8V7H9V3ZM10,3H11V7H10V3Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.5,3L20.34,3.03L15,5.1L9,3L3.36,4.9C3.15,4.97 3,5.15 3,5.38V20.5C3,20.78 3.22,21 3.5,21L3.66,20.97L9,18.9L15,21L20.339,19.2014C18.9803,17.5085 16,13.5092 16,11C16,8.4 18.2386,6 21,6V3.5C21,3.22 20.78,3 20.5,3ZM15,19L9,16.89V5L15,7.11V19Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21,17C21,17 24,13.4 24,11.15C24,9.35 22.6569,8 21,8C19.3431,8 18,9.35 18,11.15C18,13.4 21,17 21,17Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M10,2H8V4H5V3L2,5L5,7V6H8V10H10V2Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M2,2H4V4H7V3L10,5L7,7V6H4V10H2V2Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8.7544,2.4305L14.8908,12.8152C14.9623,12.9362 15,13.0741 15,13.2147C15,13.6484 14.6484,14 14.2147,14H1.7853C1.3516,14 1,13.6484 1,13.2147C1,13.0741 1.0377,12.9362 1.1092,12.8152L7.2456,2.4305C7.4033,2.1637 7.6901,2 8,2C8.3099,2 8.5967,2.1637 8.7544,2.4305ZM7.0001,6C7.0001,5.4477 7.4478,5 8,5C8.5523,5 9,5.4477 9,6V9C9,9.5523 8.5523,10 8,10C7.4478,10 7.0001,9.5523 7.0001,9V6ZM7.0001,12C7.0001,11.4477 7.4478,11 8,11C8.5523,11 9,11.4477 9,12C9,12.5523 8.5523,13 8,13C7.4478,13 7.0001,12.5523 7.0001,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,6H3V8H21V6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,11H3V13H11V11Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,16H9V18H3V16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M17,10L14,14H16V18H18V14H20L17,10Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,4H3V6H21V4ZM21,9H8V11H21V9ZM3,14H21V16H3V14ZM21,19H8V21H21V19Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.54,5.23L19.15,3.55C18.88,3.21 18.47,3 18,3H6C5.53,3 5.12,3.21 4.84,3.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19C3,20.1 3.9,21 5,21H19C20.1,21 21,20.1 21,19V6.5C21,6.02 20.83,5.57 20.54,5.23ZM12,17.5L6.5,12H10V10H14V12H17.5L12,17.5ZM5.12,5L5.93,4H17.93L18.87,5H5.12Z"
+      android:fillColor="#ffffff"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,4H14L18,8V20H6V4Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M14,2L16,4L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,4H6V20H18V8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4C4,2.8954 4.8954,2 6,2H14V4Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,5C2.8954,5 2,5.8954 2,7V17C2,18.1046 2.8954,19 4,19H20C21.1046,19 22,18.1046 22,17V7C22,5.8954 21.1046,5 20,5H4ZM9,12L6,16H18L14.5,10L11.5,14L9,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,5C2.8954,5 2,5.8954 2,7V17C2,18.1046 2.8954,19 4,19H20C21.1046,19 22,18.1046 22,17V7C22,5.8954 21.1046,5 20,5H4ZM4,7H6V9H4V7ZM18,7H20V9H18V7ZM6,11H4V13H6V11ZM18,11H20V13H18V11ZM6,15H4V17H6V15ZM18,15H20V17H18V15Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,6C2,4.8954 2.8954,4 4,4H10L12,6H20C21.1046,6 22,6.8954 22,8V18C22,19.1046 21.1046,20 20,20H4C2.8954,20 2,19.1046 2,18V6ZM16,10C15.4477,10 15,10.4477 15,11V15C15,16.6569 13.6569,18 12,18C10.3431,18 9,16.6569 9,15V12.7324C8.4022,12.3866 8,11.7403 8,11C8,9.8954 8.8954,9 10,9C11.1046,9 12,9.8954 12,11C12,11.7403 11.5978,12.3866 11,12.7324V15C11,15.5523 11.4477,16 12,16C12.5523,16 13,15.5523 13,15V11C13,9.3432 14.3431,8 16,8C17.6569,8 19,9.3432 19,11V13.2676C19.5978,13.6134 20,14.2597 20,15C20,16.1046 19.1046,17 18,17C16.8954,17 16,16.1046 16,15C16,14.2597 16.4022,13.6134 17,13.2676V11C17,10.4477 16.5523,10 16,10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM11,19.9381V18C9.8954,18 9,17.1046 9,16V15L4.2027,10.2027C4.0701,10.7804 4,11.382 4,12C4,16.0796 7.0537,19.446 11,19.9381ZM15,4.5815C17.9318,5.7683 20,8.6426 20,12C20,14.079 19.207,15.9727 17.9069,17.3953C17.6506,16.5863 16.8938,16 16,16H15V13C15,12.4477 14.5523,12 14,12H8V10H10C10.5523,10 11,9.5523 11,9V7H13C14.1046,7 15,6.1046 15,5V4.5815Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,2H21V16H4V2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19,4H6V14H19V4ZM4,2V16H21V2H4Z"
+      android:fillColor="#2F2F32"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4,2h2v20h-2z"
+      android:fillColor="#4D65F8"/>
+  <path
+      android:pathData="M9,5H7V7H9V9H7V11H9V13H11V11H13V13H15V11H17V13H19V11H17V9H19V7H17V5H15V7H13V5H11V7H9V5ZM11,9V7H13V9H11ZM15,9H17V7H15V9ZM15,9H13V11H15V9ZM11,9H9V11H11V9Z"
+      android:fillColor="#2F2F32"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,15V22H6V15H4Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#39393D"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M16,8.5L20,2H4V15H20L16,8.5Z"
+      android:fillColor="#39393D"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.4209,13L13.6516,8.5L16.4209,4H6V13H16.4209Z"
+      android:fillColor="#FF8F00"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,15V22H6V15H4Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#1D4D08"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M4,2V15H20V2H4Z"
+      android:fillColor="#1D4D08"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6,4H18V13H6V4Z"
+      android:fillColor="#7CB342"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.529,18.2068L12.7552,3.4299L11.2447,3.4299L2.4709,18.2068V20H20.5083L21.529,18.2068Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11.9999,4.1166L3.3307,18.7173C3.287,18.7909 3.2988,18.8847 3.3593,18.9452C3.3944,18.9803 3.442,19 3.4916,19H20.5082C20.5578,19 20.6054,18.9803 20.6405,18.9452C20.701,18.8847 20.7128,18.7909 20.6691,18.7173L11.9999,4.1166ZM10.3848,2.9194C10.7232,2.3494 11.337,2 11.9999,2C12.6628,2 13.2766,2.3494 13.615,2.9194L22.3888,17.6963C22.8992,18.556 22.7617,19.6524 22.0547,20.3594C21.6445,20.7696 21.0882,21 20.5082,21H3.4916C2.9116,21 2.3552,20.7696 1.9451,20.3594L1.9451,20.3594C1.2381,19.6524 1.1006,18.556 1.611,17.6963L10.3848,2.9194Z"
+      android:fillColor="#F03434"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.4615,9.8605C12.9692,9.8605 13.3846,9.4419 13.3846,8.9302C13.3846,8.4186 12.9692,8 12.4615,8C11.9538,8 11.5385,8.4186 11.5385,8.9302C11.5385,9.4419 11.9538,9.8605 12.4615,9.8605ZM10.7538,11.4419L9,18H10.0014L11,14.5L12,15.2093V18H13.0154V14.5116L12.1846,13.5814L12.4615,12.186C13.0615,12.8837 13.9846,13 15,13V12C14.1231,12 13.3846,11.9535 13.0154,11.3023L12.5538,10.5581C12.3692,10.2791 12.0923,10.093 11.7692,10.093C11.6308,10.093 11.5385,10.1395 11.4,10.1395L9,11.1628V13H10.0014V11.7367L10.7538,11.4419Z"
+      android:fillColor="#000000"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.2929,10.2929L13.7071,2.7071C13.2544,2.2543 12.6403,2 12,2C11.3597,2 10.7456,2.2543 10.2929,2.7071L2.7071,10.2929C2.2543,10.7456 2,11.3597 2,12C2,12.6403 2.2543,13.2544 2.7071,13.7071L10.2929,21.2929C10.7456,21.7456 11.3597,22 12,22C12.6403,22 13.2544,21.7456 13.7071,21.2929L21.2929,13.7071C21.7456,13.2544 22,12.6403 22,12C22,11.3597 21.7456,10.7456 21.2929,10.2929Z"
+      android:fillColor="#F8D30B"/>
+  <path
+      android:pathData="M13.7308,7.8372C13.7308,8.2977 13.3846,8.6744 12.9615,8.6744C12.5385,8.6744 12.1923,8.2977 12.1923,7.8372C12.1923,7.3767 12.5385,7 12.9615,7C13.3846,7 13.7308,7.3767 13.7308,7.8372Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M10,16L11.4615,10.0977L10.8345,10.3631V11.5H10V9.8465L12,8.9256C12.0577,8.9256 12.1058,8.9151 12.1538,8.9047C12.2019,8.8942 12.25,8.8837 12.3077,8.8837C12.5769,8.8837 12.8077,9.0512 12.9615,9.3023L13.3462,9.9721C13.6538,10.5582 14.2692,10.6 15,10.6V11.5C14.1538,11.5 13.3846,11.3954 12.8846,10.7675L12.6538,12.0233L14,13V16H13V13.4884L12,13L11,16H10Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M11.1464,3.3535C11.3728,3.1272 11.6799,3 12,3C12.3201,3 12.6272,3.1272 12.8536,3.3535L20.6464,11.1464C20.8728,11.3728 21,11.6799 21,12C21,12.3201 20.8728,12.6272 20.6464,12.8536L12.8536,20.6464C12.6272,20.8728 12.3201,21 12,21C11.6799,21 11.3728,20.8728 11.1464,20.6464L3.3535,12.8536C3.1272,12.6272 3,12.3201 3,12C3,11.6799 3.1272,11.3728 3.3535,11.1464L11.1464,3.3535ZM12.1464,4.0607L19.9393,11.8536C19.9782,11.8924 20,11.9451 20,12C20,12.0549 19.9782,12.1076 19.9393,12.1464L12.1464,19.9393C12.1076,19.9782 12.0549,20 12,20C11.9451,20 11.8924,19.9782 11.8536,19.9393L4.0607,12.1464C4.0218,12.1076 4,12.0549 4,12C4,11.9451 4.0218,11.8924 4.0607,11.8536L11.8536,4.0607C11.8924,4.0218 11.9451,4 12,4C12.0549,4 12.1076,4.0218 12.1464,4.0607Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.529,18.2068L12.7552,3.4299L11.2447,3.4299L2.4709,18.2068V20H20.5083L21.529,18.2068Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11.9999,4.1166L3.3307,18.7173C3.287,18.7909 3.2988,18.8847 3.3593,18.9452C3.3944,18.9803 3.442,19 3.4916,19H20.5082C20.5578,19 20.6054,18.9803 20.6405,18.9452C20.701,18.8847 20.7128,18.7909 20.6691,18.7173L11.9999,4.1166ZM10.3848,2.9194C10.7232,2.3494 11.337,2 11.9999,2C12.6628,2 13.2766,2.3494 13.615,2.9194L22.3888,17.6963C22.8992,18.556 22.7617,19.6524 22.0547,20.3594C21.6445,20.7696 21.0882,21 20.5082,21H3.4916C2.9116,21 2.3552,20.7696 1.9451,20.3594L1.9451,20.3594C1.2381,19.6524 1.1006,18.556 1.611,17.6963L10.3848,2.9194Z"
+      android:fillColor="#F03434"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M13,9C13,9.5523 12.5523,10 12,10C12,10.5523 11.5523,11 11,11C10.9526,11 10.9059,10.9967 10.8602,10.9903C10.8311,11.4541 10.4624,11.8257 10,11.8596V12H9V11L9.0023,10.9977C9.0008,10.9756 9,10.9534 9,10.931C9,10.4168 9.4168,10 9.931,10C9.9534,10 9.9756,10.0008 9.9977,10.0023L10,10C10,9.4477 10.4477,9 11,9C11,8.4477 11.4477,8 12,8C12.5523,8 13,8.4477 13,9Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M16,17H15V15.9843H10V17H7L8.3448,15L7.9688,14L8.3448,13H9V12.5L10,12.5172V13H11V12.5H12V13H13V12H16V17ZM14,13H15V14H14V13Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11,16H12V17H11V16Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M14,16H13V17H14V16Z"
+      android:fillColor="#000000"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#FFD200"/>
+  <path
+      android:pathData="M21,12C21,16.9706 16.9706,21 12,21C7.0294,21 3,16.9706 3,12C3,7.0294 7.0294,3 12,3C16.9706,3 21,7.0294 21,12ZM16.9056,18.3199C15.5509,19.3729 13.8487,20 12,20C10.1513,20 8.4491,19.3729 7.0944,18.3199L11.9999,13.4143L16.9056,18.3199ZM18.3198,16.9057L13.4141,12L18.3198,7.0943C19.3729,8.449 20,10.1513 20,12C20,13.8487 19.3729,15.551 18.3198,16.9057ZM16.9056,5.6801L11.9999,10.5858L7.0943,5.6802C8.449,4.6271 10.1513,4 12,4C13.8487,4 15.5509,4.6271 16.9056,5.6801ZM5.6801,7.0944C4.6271,8.4491 4,10.1513 4,12C4,13.8487 4.6271,15.551 5.6802,16.9057L10.5857,12.0001L5.6801,7.0944Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4h16v16h-16z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M9.0001,14C9.0001,14.5523 8.5523,15 8.0001,15C7.4478,15 7.0001,14.5523 7.0001,14C7.0001,13.4477 7.4478,13 8.0001,13C8.5523,13 9.0001,13.4477 9.0001,14Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M10.5,10C10.7761,10 11,9.7762 11,9.5C11,9.2239 10.7761,9 10.5,9C10.2238,9 10,9.2239 10,9.5C10,9.7762 10.2238,10 10.5,10Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M5,8C5,7.4477 5.4477,7 6,7H12C12.5523,7 13,7.4477 13,8V16C13,16.5523 12.5523,17 12,17H6C5.4477,17 5,16.5523 5,16V8ZM8.0001,16C9.1046,16 10.0001,15.1046 10.0001,14C10.0001,12.8954 9.1046,12 8.0001,12C6.8955,12 6.0001,12.8954 6.0001,14C6.0001,15.1046 6.8955,16 8.0001,16ZM12,9.5C12,10.3284 11.3284,11 10.5,11C9.6715,11 9,10.3284 9,9.5C9,8.6716 9.6715,8 10.5,8C11.3284,8 12,8.6716 12,9.5Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14,9H16V14H14V9Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M17,10H18V11.0666H19V14H18V16H14V15H17V10Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M2,4C2,2.8954 2.8954,2 4,2H20C21.1046,2 22,2.8954 22,4V20C22,21.1046 21.1046,22 20,22H4C2.8954,22 2,21.1046 2,20V4ZM4,4H20V20H4V4Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.529,18.2068L12.7552,3.4299L11.2447,3.4299L2.4709,18.2068V20H20.5083L21.529,18.2068Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11.9999,4.1166L3.3307,18.7173C3.287,18.7909 3.2988,18.8847 3.3593,18.9452C3.3944,18.9803 3.442,19 3.4916,19H20.5082C20.5578,19 20.6054,18.9803 20.6405,18.9452C20.701,18.8847 20.7128,18.7909 20.6691,18.7173L11.9999,4.1166ZM10.3848,2.9194C10.7232,2.3494 11.337,2 11.9999,2C12.6628,2 13.2766,2.3494 13.615,2.9194L22.3888,17.6963C22.8992,18.556 22.7617,19.6524 22.0547,20.3594C21.6445,20.7696 21.0882,21 20.5082,21H3.4916C2.9116,21 2.3552,20.7696 1.9451,20.3594L1.9451,20.3594C1.2381,19.6524 1.1006,18.556 1.611,17.6963L10.3848,2.9194Z"
+      android:fillColor="#F03434"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7,17V15L8,15C9.3833,15 10.2861,13 12,13C13.7525,13 14.415,15 16,15L17,15V17H7Z"
+      android:fillColor="#000000"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.4697,10.7197L13.2803,2.5303C12.9408,2.1908 12.4802,2 12,2C11.5198,2 11.0592,2.1908 10.7197,2.5303L2.5303,10.7197C2.1908,11.0592 2,11.5198 2,12C2,12.4802 2.1908,12.9408 2.5303,13.2803L10.7197,21.4697C11.0592,21.8092 11.5198,22 12,22C12.4802,22 12.9408,21.8092 13.2803,21.4697L21.4697,13.2803C21.8092,12.9408 22,12.4802 22,12C22,11.5198 21.8092,11.0592 21.4697,10.7197Z"
+      android:fillColor="#FFD200"/>
+  <path
+      android:pathData="M9.6797,9.733C9.6077,9.733 9.5577,9.713 9.5297,9.673C9.4808,9.6015 9.4812,9.531 9.4816,9.4507L9.4817,9.427H9.1907C9.1907,9.5815 9.2182,9.7192 9.3077,9.85C9.3857,9.962 9.5117,10.018 9.6857,10.018C9.8497,10.018 9.9667,9.974 10.0367,9.886C10.1067,9.794 10.1477,9.724 10.1597,9.676C10.1851,9.5891 10.1833,9.4958 10.1816,9.4047C10.1811,9.382 10.1807,9.3593 10.1807,9.337C10.1807,9.203 10.1427,9.095 10.0667,9.013C9.9907,8.931 9.9047,8.874 9.8087,8.842C9.7899,8.8349 9.7693,8.8282 9.7479,8.8211C9.662,8.793 9.5633,8.7606 9.5177,8.689C9.4936,8.6406 9.4961,8.5794 9.4984,8.5229C9.4991,8.5068 9.4997,8.4909 9.4997,8.476C9.4997,8.3505 9.5831,8.257 9.6977,8.257C9.8709,8.257 9.8927,8.4268 9.8927,8.566H10.1807C10.1807,8.3994 10.1615,8.2459 10.0397,8.119C9.9477,8.021 9.8317,7.972 9.6917,7.972C9.5577,7.972 9.4437,8.022 9.3497,8.122C9.2306,8.2489 9.2117,8.4009 9.2117,8.566C9.2117,8.7 9.2447,8.806 9.3107,8.884C9.3767,8.962 9.4587,9.019 9.5567,9.055C9.5717,9.0605 9.588,9.066 9.6052,9.0719C9.6995,9.1041 9.8188,9.1449 9.8687,9.226C9.8847,9.25 9.8927,9.284 9.8927,9.328C9.8927,9.351 9.8935,9.3741 9.8943,9.3974C9.8964,9.4575 9.8985,9.5182 9.8867,9.577C9.8796,9.6479 9.7925,9.733 9.6797,9.733Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M10.4347,7.99V10H10.7227V9.208H10.8997C10.9637,9.208 11.0237,9.196 11.0797,9.172C11.1957,9.124 11.2807,9.038 11.3287,8.926C11.3815,8.8083 11.3759,8.6658 11.3707,8.5325C11.3692,8.4936 11.3677,8.4555 11.3677,8.419C11.3657,8.365 11.3517,8.313 11.3257,8.263C11.2777,8.159 11.1907,8.077 11.0827,8.029C11.0287,8.003 10.9717,7.99 10.9117,7.99H10.4347ZM11.09,8.5557C11.0953,8.6457 11.1009,8.7406 11.0767,8.821C11.0674,8.8677 11.0142,8.912 10.9687,8.926C10.9106,8.9405 10.847,8.9384 10.7854,8.9364C10.7642,8.9357 10.7432,8.935 10.7227,8.935V8.254H10.8967C11.0111,8.254 11.0857,8.3353 11.0857,8.449C11.0857,8.4828 11.0879,8.519 11.09,8.5557Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.4325,9.712V10H11.5715V7.99H12.4325V8.254H11.8565V8.848H12.3605V9.121H11.8565V9.712H12.4325Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M13.5575,10V9.712H12.9815V9.121H13.4855V8.848H12.9815V8.254H13.5575V7.99H12.6965V10H13.5575Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M14.2775,7.99C14.4075,7.99 14.5185,8.036 14.6105,8.128C14.7045,8.218 14.7515,8.328 14.7515,8.458V9.502C14.7515,9.65 14.7065,9.77 14.6165,9.862C14.5265,9.954 14.4105,10 14.2685,10H13.8215V7.99H14.2775ZM14.4665,9.502V8.458C14.4665,8.402 14.4455,8.355 14.4035,8.317C14.3635,8.279 14.3145,8.26 14.2565,8.26H14.1065V9.733H14.2475C14.3935,9.733 14.4665,9.656 14.4665,9.502Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M10.2038,11.029C10.1498,11.003 10.0918,10.99 10.0298,10.99H9.5558V13H9.9998C10.1418,13 10.2578,12.954 10.3478,12.862C10.4906,12.7192 10.4884,12.5304 10.4863,12.3441C10.4861,12.3216 10.4858,12.2993 10.4858,12.277C10.4858,12.125 10.4248,12.013 10.3028,11.941C10.4248,11.879 10.4858,11.771 10.4858,11.617V11.464C10.4858,11.328 10.4528,11.228 10.3868,11.164C10.3248,11.102 10.2638,11.057 10.2038,11.029ZM10.2008,11.464V11.587C10.2008,11.657 10.1858,11.713 10.1558,11.755C10.1015,11.8274 9.9916,11.8218 9.9003,11.8171C9.8792,11.816 9.859,11.815 9.8408,11.815V11.26C9.8588,11.26 9.8777,11.2592 9.8971,11.2585C9.9857,11.2549 10.0843,11.251 10.1468,11.317C10.1828,11.353 10.2008,11.402 10.2008,11.464ZM10.2008,12.277V12.511C10.2008,12.569 10.1828,12.618 10.1468,12.658C10.1108,12.696 10.0638,12.715 10.0058,12.715H9.8408V12.07H10.0028C10.0648,12.07 10.1128,12.089 10.1468,12.127C10.1828,12.163 10.2008,12.213 10.2008,12.277Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.2427,13.018C10.9795,13.018 10.7717,12.8182 10.7717,12.526V10.99H11.0597V12.526C11.0597,12.6401 11.1244,12.733 11.2457,12.733C11.3648,12.733 11.4197,12.6273 11.4197,12.526V10.99H11.7077V12.526C11.7077,12.7869 11.5113,13.018 11.2427,13.018Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M13.0218,11.776V13H13.3068V10.99H13.0428L12.6678,12.061L12.2868,10.99H12.0168V13H12.3048V11.776L12.5898,12.634H12.7338L13.0218,11.776Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M13.6193,13V10.99H14.0963C14.1563,10.99 14.2133,11.003 14.2673,11.029C14.3753,11.077 14.4623,11.159 14.5103,11.263C14.5363,11.313 14.5503,11.365 14.5523,11.419V11.71C14.5523,11.7847 14.5443,11.8569 14.5133,11.926C14.4653,12.038 14.3803,12.124 14.2643,12.172C14.1706,12.2121 14.0684,12.2104 13.9679,12.2087C13.9477,12.2083 13.9273,12.208 13.9073,12.208V13H13.6193ZM14.2613,11.821C14.2854,11.7406 14.2799,11.6457 14.2746,11.5557C14.2724,11.5189 14.2703,11.4828 14.2703,11.449C14.2703,11.393 14.2533,11.347 14.2193,11.311C14.1853,11.273 14.1393,11.254 14.0813,11.254H13.9073V11.935C13.9277,11.935 13.9487,11.9357 13.97,11.9364C14.0316,11.9384 14.0952,11.9405 14.1533,11.926C14.1988,11.912 14.252,11.8677 14.2613,11.821Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9.513,13.99L9.063,16H9.366L9.45,15.568H9.822L9.903,16H10.212L9.762,13.99H9.513ZM9.771,15.301H9.501L9.636,14.569L9.771,15.301Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M10.3586,16V13.99H10.6436V14.848H11.0096V13.99H11.2946V16H11.0096V15.103H10.6436V16H10.3586Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M12.4676,16V15.712H11.8916V15.121H12.3956V14.848H11.8916V14.254H12.4676V13.99H11.6066V16H12.4676Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M12.5786,16L13.0286,13.99H13.2776L13.7276,16H13.4186L13.3376,15.568H12.9656L12.8816,16H12.5786ZM13.2866,15.301L13.1516,14.569L13.0166,15.301H13.2866Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.6632,14.128C14.5712,14.036 14.4602,13.99 14.3302,13.99H13.8742V16H14.3212C14.4632,16 14.5792,15.954 14.6692,15.862C14.7592,15.77 14.8042,15.65 14.8042,15.502V14.458C14.8042,14.328 14.7572,14.218 14.6632,14.128ZM14.5192,14.458V15.502C14.5192,15.656 14.4462,15.733 14.3002,15.733H14.1592V14.26H14.3092C14.3672,14.26 14.4162,14.279 14.4562,14.317C14.4982,14.355 14.5192,14.402 14.5192,14.458Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.8305,3.344L20.656,11.1695C20.8763,11.3898 21,11.6885 21,12C21,12.3115 20.8763,12.6102 20.656,12.8305L12.8305,20.656C12.6102,20.8763 12.3115,21 12,21C11.6885,21 11.3898,20.8763 11.1695,20.656L3.344,12.8305C3.1237,12.6102 3,12.3115 3,12C3,11.6885 3.1237,11.3898 3.344,11.1695L11.1695,3.344C11.3898,3.1237 11.6885,3 12,3C12.3115,3 12.6102,3.1237 12.8305,3.344ZM12.1234,4.0511L19.9489,11.8766C19.9816,11.9093 20,11.9537 20,12C20,12.0463 19.9816,12.0907 19.9489,12.1234L12.1234,19.9489C12.0907,19.9816 12.0463,20 12,20C11.9537,20 11.9093,19.9816 11.8766,19.9489L4.0511,12.1234C4.0184,12.0907 4,12.0463 4,12C4,11.9537 4.0184,11.9093 4.0511,11.8766L11.8766,4.0511C11.9093,4.0184 11.9537,4 12,4C12.0463,4 12.0907,4.0184 12.1234,4.0511Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.529,18.2068L12.7552,3.4299L11.2447,3.4299L2.4709,18.2068V20H20.5083L21.529,18.2068Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11.9999,4.1166L3.3307,18.7173C3.287,18.7909 3.2988,18.8847 3.3593,18.9452C3.3944,18.9803 3.442,19 3.4916,19H20.5082C20.5578,19 20.6054,18.9803 20.6405,18.9452C20.701,18.8847 20.7128,18.7909 20.6691,18.7173L11.9999,4.1166ZM10.3848,2.9194C10.7232,2.3494 11.337,2 11.9999,2C12.6628,2 13.2766,2.3494 13.615,2.9194L22.3888,17.6963C22.8992,18.556 22.7617,19.6524 22.0547,20.3594C21.6445,20.7696 21.0882,21 20.5082,21H3.4916C2.9116,21 2.3552,20.7696 1.9451,20.3594L1.9451,20.3594C1.2381,19.6524 1.1006,18.556 1.611,17.6963L10.3848,2.9194Z"
+      android:fillColor="#F03434"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12,10C9.7909,10 8,11.7909 8,14V18H16V14C16,11.7909 14.2091,10 12,10ZM13.5,14C12.6716,14 12,14.6716 12,15.5V17H15V15.5C15,14.6716 14.3284,14 13.5,14Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.4697,10.7197L13.2803,2.5303C12.9408,2.1908 12.4802,2 12,2C11.5198,2 11.0592,2.1908 10.7197,2.5303L2.5303,10.7197C2.1908,11.0592 2,11.5198 2,12C2,12.4802 2.1908,12.9408 2.5303,13.2803L10.7197,21.4697C11.0592,21.8092 11.5198,22 12,22C12.4802,22 12.9408,21.8092 13.2803,21.4697L21.4697,13.2803C21.8092,12.9408 22,12.4802 22,12C22,11.5198 21.8092,11.0592 21.4697,10.7197Z"
+      android:fillColor="#FFD200"/>
+  <path
+      android:pathData="M7.4522,13V10.676H7.0002V10.32H8.2922V10.676H7.8322V13H7.4522Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M9.3063,13.024C8.9354,13.024 8.6783,12.7214 8.6783,12.368V10.32H9.0623V12.368C9.0623,12.5205 9.1521,12.644 9.3103,12.644C9.4692,12.644 9.5423,12.5031 9.5423,12.368V10.32H9.9263V12.368C9.9263,12.7121 9.6578,13.024 9.3063,13.024Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M11.4385,13L10.8425,11.372V13H10.4585V10.32H10.8225L11.4145,11.944V10.32H11.7985V13H11.4385Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M13.3163,13L12.7203,11.372V13H12.3363V10.32H12.7003L13.2923,11.944V10.32H13.6763V13H13.3163Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M15.3621,12.616V13H14.2141V10.32H15.3621V10.672H14.5941V11.464H15.2661V11.828H14.5941V12.616H15.3621Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M16.9821,13H15.8381V10.32H16.2221V12.616H16.9821V13Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M20.656,11.1695L12.8305,3.344C12.6102,3.1237 12.3115,3 12,3C11.6885,3 11.3898,3.1237 11.1695,3.344L3.344,11.1695C3.1237,11.3898 3,11.6885 3,12C3,12.3115 3.1237,12.6102 3.344,12.8305L11.1695,20.656C11.3898,20.8763 11.6885,21 12,21C12.3115,21 12.6102,20.8763 12.8305,20.656L20.656,12.8305C20.8763,12.6102 21,12.3115 21,12C21,11.6885 20.8763,11.3898 20.656,11.1695ZM19.9489,11.8766L12.1234,4.0511C12.0907,4.0184 12.0463,4 12,4C11.9537,4 11.9093,4.0184 11.8766,4.0511L4.0511,11.8766C4.0184,11.9093 4,11.9537 4,12C4,12.0463 4.0184,12.0907 4.0511,12.1234L11.8766,19.9489C11.9093,19.9816 11.9537,20 12,20C12.0463,20 12.0907,19.9816 12.1234,19.9489L19.9489,12.1234C19.9816,12.0907 20,12.0463 20,12C20,11.9537 19.9816,11.9093 19.9489,11.8766Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/add_gpx_point_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -16,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/content_padding"
-        android:src="@drawable/ic_action_photo_dark"/>
+        osmand:srcCompat="@drawable/ic_action_photo_dark"/>
 
     <LinearLayout
         android:layout_weight="1"
diff --git a/OsmAnd/res/layout-land/context_menu_card_dialog.xml b/OsmAnd/res/layout-land/context_menu_card_dialog.xml
index 27bbda6e6c..e0cc9b554f 100644
--- a/OsmAnd/res/layout-land/context_menu_card_dialog.xml
+++ b/OsmAnd/res/layout-land/context_menu_card_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:orientation="vertical"
               android:layout_width="@dimen/dashboard_land_width"
@@ -30,7 +31,7 @@
                 android:layout_gravity="top"
                 android:contentDescription="@string/shared_string_close"
                 android:tint="@color/color_white"
-                android:src="@drawable/ic_action_remove_dark"/>
+                osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
             <LinearLayout
                 android:id="@+id/title_layout"
@@ -76,7 +77,7 @@
                 android:layout_height="56dp"
                 android:layout_gravity="top"
                 android:contentDescription="@string/shared_string_more"
-                android:src="@drawable/ic_overflow_menu_white"
+                osmand:srcCompat="@drawable/ic_overflow_menu_white"
                 android:visibility="gone"/>
 
         </LinearLayout>
@@ -90,4 +91,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:id="@+id/share_fragment_layout"
+             xmlns:osmand="http://schemas.android.com/apk/res-auto"
              xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
@@ -35,7 +36,7 @@
                         android:layout_width="56dp"
                         android:layout_height="56dp"
                         android:scaleType="center"
-                        android:src="@drawable/list_destination"/>
+                        osmand:srcCompat="@drawable/list_destination"/>
 
                 </LinearLayout>
 
@@ -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"/>
 
                     </LinearLayout>
 
@@ -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" />
 
                     <View
                         android:layout_width="match_parent"
@@ -132,15 +133,15 @@
                         android:paddingBottom="12dp"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
-                        android:drawableLeft="@drawable/ic_action_done"
+						osmand:drawableLeftCompat="@drawable/ic_action_done"
+						osmand:drawableStartCompat="@drawable/ic_action_done"
                         android:drawablePadding="12dp"
                         android:gravity="start|center_vertical"
                         android:textColor="?android:textColorPrimary"
                         style="@style/Widget.AppCompat.Button.Borderless"
                         android:text="@string/finish_navigation"
 	                    android:paddingEnd="8dp"
-	                    android:paddingStart="8dp"
-	                    android:drawableStart="@drawable/ic_action_done" />
+	                    android:paddingStart="8dp" />
 
                 </LinearLayout>
 
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"/>
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/toolbar_text"
@@ -92,7 +92,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="end"
                 android:scaleType="fitXY"
-                android:src="@drawable/bg_shadow_quick_input_left"/>
+                osmand:srcCompat="@drawable/bg_shadow_quick_input_left"/>
 
         </FrameLayout>
 
@@ -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"/>
 
         </FrameLayout>
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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" />
                 </FrameLayout>
 
             </LinearLayout>
@@ -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" />
             </LinearLayout>
 
         </LinearLayout>
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"/>
 
                 <TextView
                     android:id="@+id/map_alarm_warning_text"
@@ -100,7 +100,7 @@
                         android:layout_height="@dimen/map_button_size"
                         android:background="@drawable/btn_round"
                         android:contentDescription="@string/backToMenu"
-                        tools:src="@drawable/ic_action_test_light"/>
+                        tools:src="@drawable/ic_action_remove_dark"/>
 
                     <ImageButton
                         android:id="@+id/map_route_info_button"
@@ -110,7 +110,7 @@
                         android:layout_marginStart="@dimen/map_button_spacing_land"
                         android:background="@drawable/btn_round"
                         android:contentDescription="@string/layer_route"
-                        tools:src="@drawable/ic_action_test_light"/>
+                        tools:src="@drawable/ic_action_remove_dark"/>
 
                     <ImageButton
                         android:id="@+id/snap_to_road_image_button"
@@ -119,7 +119,7 @@
                         android:layout_gravity="bottom"
                         android:background="@drawable/btn_circle"
                         android:visibility="gone"
-                        tools:src="@drawable/ic_action_test_light"/>
+                        tools:src="@drawable/ic_action_remove_dark"/>
                 </LinearLayout>
             </LinearLayout>
         </FrameLayout>
@@ -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"/>
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -243,7 +243,7 @@
                     android:layout_height="@dimen/map_button_size"
                     android:background="@drawable/btn_circle"
                     android:contentDescription="@string/zoomIn"
-                    tools:src="@drawable/ic_action_test_light"/>
+                    tools:src="@drawable/ic_action_remove_dark"/>
 
                 <ImageButton
                     android:id="@+id/map_zoom_out_button"
@@ -252,7 +252,7 @@
                     android:layout_marginTop="@dimen/map_button_spacing_land"
                     android:background="@drawable/btn_circle"
                     android:contentDescription="@string/zoomOut"
-                    tools:src="@drawable/ic_action_test_light"/>
+                    tools:src="@drawable/ic_action_remove_dark"/>
             </LinearLayout>
         </LinearLayout>
 
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" />
 
                 <TextView
                     android:id="@+id/lat_coordinates"
@@ -88,7 +88,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_longitude_day" />
+                    osmand:srcCompat="@drawable/widget_coordinates_longitude_day" />
 
                 <TextView
                     android:id="@+id/lon_coordinates"
@@ -146,7 +146,7 @@
                                 android:id="@+id/map_marker_arrow"
                                 android:layout_width="60dp"
                                 android:layout_height="24dp"
-                                android:src="@drawable/ic_arrow_marker_diretion"/>
+                                osmand:srcCompat="@drawable/ic_arrow_marker_diretion"/>
 
                             <LinearLayout
                                 android:layout_width="0dp"
@@ -193,7 +193,7 @@
                                 android:layout_width="50dp"
                                 android:layout_height="48dp"
                                 android:background="?attr/selectableItemBackgroundBorderless"
-                                android:src="@drawable/ic_action_markers_list"/>
+                                osmand:srcCompat="@drawable/ic_action_markers_list"/>
 
                         </LinearLayout>
 
@@ -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"/>
 
                             <LinearLayout
                                 android:layout_width="0dp"
@@ -271,7 +271,7 @@
                                 android:layout_width="50dp"
                                 android:layout_height="48dp"
                                 android:background="?attr/selectableItemBackgroundBorderless"
-                                android:src="@drawable/ic_action_markers_list"/>
+                                osmand:srcCompat="@drawable/ic_action_markers_list"/>
 
                         </LinearLayout>
 
@@ -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"/>
 
                     <ImageButton
                         android:id="@+id/waypoint_close"
@@ -509,7 +509,7 @@
                         android:layout_height="@dimen/map_address_height"
                         android:background="@drawable/btn_circle_transparent"
                         android:layout_gravity="center_vertical"
-                        android:src="@drawable/ic_action_test_light"/>
+                        osmand:srcCompat="@drawable/ic_action_remove_dark"/>
                 </LinearLayout>
             </FrameLayout>
 
@@ -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"/>
 
                     <LinearLayout
                         android:id="@+id/widget_top_bar_title_layout"
@@ -602,7 +602,7 @@
                         android:layout_height="56dp"
                         android:layout_gravity="top"
                         android:contentDescription="@string/shared_string_refresh"
-                        android:src="@drawable/ic_action_refresh_dark"
+                        osmand:srcCompat="@drawable/ic_action_refresh_dark"
                         android:visibility="gone"/>
 
                     <ImageButton
@@ -612,7 +612,7 @@
                         android:layout_height="56dp"
                         android:layout_gravity="top"
                         android:contentDescription="@string/shared_string_close"
-                        android:src="@drawable/ic_action_remove_dark"/>
+                        osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
                     <net.osmand.plus.widgets.TextViewEx
                         android:id="@+id/widget_top_bar_save"
@@ -684,7 +684,7 @@
                     android:layout_height="@dimen/map_small_button_size"
                     android:background="@drawable/btn_inset_circle_trans"
                     android:contentDescription="@string/configure_map"
-                    android:src="@drawable/ic_action_test_light"/>
+                    osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
                 <ImageButton
                     android:id="@+id/map_compass_button"
@@ -693,7 +693,7 @@
                     android:layout_marginTop="@dimen/map_small_button_margin"
                     android:background="@drawable/btn_inset_circle_trans"
                     android:contentDescription="@string/map_widget_compass"
-                    android:src="@drawable/ic_action_test_light"/>
+                    osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
             </LinearLayout>
 
@@ -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"/>
 
             </LinearLayout>
 
@@ -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"/>
         </LinearLayout>
     </FrameLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/move_marker_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -16,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/content_padding"
-        android:src="@drawable/ic_action_photo_dark"/>
+        osmand:srcCompat="@drawable/ic_action_photo_dark"/>
 
     <LinearLayout
         android:layout_weight="1"
diff --git a/OsmAnd/res/layout-land/point_editor_fragment.xml b/OsmAnd/res/layout-land/point_editor_fragment.xml
index 066db9defa..82dc51228b 100644
--- a/OsmAnd/res/layout-land/point_editor_fragment.xml
+++ b/OsmAnd/res/layout-land/point_editor_fragment.xml
@@ -68,7 +68,7 @@
                                 android:layout_marginLeft="12dp"
                                 android:layout_marginStart="12dp"
                                 android:scaleType="centerInside"
-                                android:src="@drawable/ic_action_building_number"/>
+                                app:srcCompat="@drawable/ic_action_building_number"/>
 
                         </LinearLayout>
 
@@ -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"/>
 
                         </LinearLayout>
 
@@ -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"/>
 
                         </LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/plan_route_info"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/dashboard_land_width"
@@ -30,7 +31,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"/>
 
             <LinearLayout
                 android:id="@+id/top_bar_title_layout"
@@ -76,7 +77,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="top"
                 android:contentDescription="@string/shared_string_close"
-                android:src="@drawable/ic_action_remove_dark"/>
+                osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
         </LinearLayout>
 
@@ -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" />
 
                     </LinearLayout>
@@ -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" />
 
                     </LinearLayout>
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"/>
 
         <View
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml b/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
index 40603fc059..1b995263b4 100644
--- a/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
+++ b/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/add_gpx_point_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -16,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/content_padding"
-        android:src="@drawable/ic_action_photo_dark"/>
+        osmand:srcCompat="@drawable/ic_action_photo_dark"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/along_the_route_point_item.xml b/OsmAnd/res/layout/along_the_route_point_item.xml
index 9a5e3727f9..05f470fb2d 100644
--- a/OsmAnd/res/layout/along_the_route_point_item.xml
+++ b/OsmAnd/res/layout/along_the_route_point_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/package_delivered_layout"
 	android:layout_width="match_parent"
@@ -23,7 +24,7 @@
 			android:layout_marginLeft="@dimen/content_padding"
 			android:layout_marginRight="@dimen/content_padding"
 			android:layout_marginTop="@dimen/content_padding"
-			android:src="@drawable/ic_action_fav_dark"
+			osmand:srcCompat="@drawable/ic_action_fav_dark"
 			android:layout_marginStart="@dimen/content_padding"
 			android:layout_marginEnd="@dimen/content_padding" />
 
@@ -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" />
 
 	</LinearLayout>
 
@@ -113,4 +114,4 @@
 		android:layout_marginTop="@dimen/content_padding_half"
 		android:background="?attr/divider_color_basic" />
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -65,7 +66,7 @@
                         android:layout_gravity="center"
                         style="@style/Widget.AppCompat.Button.Borderless"
                         tools:background="@color/color_warning"
-                        android:src="@drawable/ic_action_remove_dark"/>
+                        osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
                 </LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:id="@+id/bottomShadowView"
               android:orientation="vertical"
               android:layout_width="match_parent"
@@ -8,6 +9,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"/>
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:id="@+id/topShadowView"
               android:orientation="vertical"
               android:layout_width="match_parent"
@@ -12,6 +13,6 @@
         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"/>
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/change_color_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -19,7 +20,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
         android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
-        android:src="@drawable/ic_action_appearance" />
+        osmand:srcCompat="@drawable/ic_action_appearance" />
 
     <TextView
         android:id="@+id/title"
@@ -36,6 +37,6 @@
         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" />
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/LinearLayout1"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -13,7 +14,7 @@
 	android:layout_marginEnd="5dip">
 
     <ImageButton
-        android:src="@drawable/ic_action_down_dark"
+        osmand:srcCompat="@drawable/ic_action_down_dark"
         android:id="@+id/down"
         android:contentDescription="@string/shared_string_move_down"
         android:layout_width="wrap_content"
@@ -31,7 +32,7 @@
         android:layout_weight="1" />
 
     <ImageButton
-        android:src="@drawable/ic_action_up_dark"
+        osmand:srcCompat="@drawable/ic_action_up_dark"
         android:id="@+id/up"
         android:contentDescription="@string/shared_string_move_up"
         android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/context_menu_card_add_mapillary_images.xml b/OsmAnd/res/layout/context_menu_card_add_mapillary_images.xml
index f2c3cfaebb..252341a789 100644
--- a/OsmAnd/res/layout/context_menu_card_add_mapillary_images.xml
+++ b/OsmAnd/res/layout/context_menu_card_add_mapillary_images.xml
@@ -31,8 +31,8 @@
         android:background="@drawable/blue_button_drawable"
         app:backgroundTint="@color/mapillary_color"
         android:layout_gravity="bottom|center_horizontal"
-        android:drawableLeft="@drawable/ic_action_mapillary"
-        android:drawableStart="@drawable/ic_action_mapillary"
+		app:drawableLeftCompat="@drawable/ic_action_mapillary"
+        app:drawableStartCompat="@drawable/ic_action_mapillary"
         android:drawablePadding="@dimen/content_padding_half"
         android:paddingLeft="10dp"
         android:paddingRight="14dp"
diff --git a/OsmAnd/res/layout/context_menu_card_dialog.xml b/OsmAnd/res/layout/context_menu_card_dialog.xml
index 3445e91c25..0aa7465ccc 100644
--- a/OsmAnd/res/layout/context_menu_card_dialog.xml
+++ b/OsmAnd/res/layout/context_menu_card_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:orientation="vertical"
               android:layout_width="match_parent"
@@ -24,7 +25,7 @@
             android:layout_gravity="top"
             android:contentDescription="@string/shared_string_close"
             android:tint="@color/color_white"
-            android:src="@drawable/ic_action_remove_dark"/>
+            osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
         <LinearLayout
             android:id="@+id/title_layout"
@@ -70,7 +71,7 @@
             android:layout_height="56dp"
             android:layout_gravity="top"
             android:contentDescription="@string/shared_string_more"
-            android:src="@drawable/ic_overflow_menu_white"
+            osmand:srcCompat="@drawable/ic_overflow_menu_white"
             android:visibility="gone"/>
 
     </LinearLayout>
@@ -89,4 +90,4 @@
         android:foreground="@drawable/bg_contextmenu_shadow"
         android:foregroundGravity="top|fill_horizontal"/>
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/context_menu_top_shadow"
 	android:layout_width="match_parent"
 	android:layout_height="@dimen/contex_menu_top_shadow_height"
@@ -10,6 +11,6 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom"
 		android:scaleType="fitXY"
-		android:src="@drawable/bg_shadow_onmap" />
+		osmand:srcCompat="@drawable/bg_shadow_onmap" />
 
 </FrameLayout>
\ 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" />
 
 </LinearLayout>
\ 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" />
 
                     <TextView
@@ -115,7 +115,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginRight="@dimen/gpx_small_icon_margin"
-                        android:src="@drawable/ic_small_point"
+                        osmand:srcCompat="@drawable/ic_action_waypoint_16"
 	                    android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
 
                     <TextView
@@ -178,12 +178,12 @@
                 android:paddingRight="10dp"
                 android:textColor="?attr/color_dialog_buttons"
                 android:background="?attr/selectableItemBackground"
-                android:drawableLeft="@drawable/ic_action_rec_stop"
-                android:text="@string/shared_string_control_stop"
+				osmand:drawableLeftCompat="@drawable/ic_action_rec_stop"
+				osmand:drawableStartCompat="@drawable/ic_action_rec_stop"
+				android:text="@string/shared_string_control_stop"
 	            android:paddingStart="10dp"
 	            android:layout_marginStart="40dp"
-	            android:paddingEnd="10dp"
-	            android:drawableStart="@drawable/ic_action_rec_stop" />
+	            android:paddingEnd="10dp" />
 
             <Button
                 android:id="@+id/save_button"
@@ -192,12 +192,12 @@
                 android:background="?attr/selectableItemBackground"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:drawableLeft="@drawable/ic_action_gsave_dark"
+                osmand:drawableLeftCompat="@drawable/ic_action_gsave_dark"
+				osmand:drawableStartCompat="@drawable/ic_action_gsave_dark"
                 android:textColor="?attr/color_dialog_buttons"
                 android:text="@string/shared_string_save"
                 android:visibility="gone"
                 tools:visibility="visible"
-	            android:drawableStart="@drawable/ic_action_gsave_dark"
 	            android:paddingEnd="10dp"
 	            android:paddingStart="10dp" />
 
@@ -205,4 +205,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -28,7 +29,7 @@
 			android:scaleType="center"
 			android:layout_marginLeft="@dimen/dashFavIconMargin"
 			android:layout_marginRight="@dimen/dashFavIconMargin"
-			android:src="@drawable/ic_action_remove_dark"
+			osmand:srcCompat="@drawable/ic_action_remove_dark"
 			android:layout_marginEnd="@dimen/dashFavIconMargin"
 			android:layout_marginStart="@dimen/dashFavIconMargin" />
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:osmand="http://schemas.android.com/apk/res-auto"
 			  xmlns:tools="http://schemas.android.com/tools"
 			  android:layout_width="match_parent"
 			  android:layout_height="wrap_content"
@@ -42,7 +43,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/list_content_padding"
-			android:src="@drawable/ic_action_polygom_dark"
+			osmand:srcCompat="@drawable/ic_action_polygom_dark"
 			android:visibility="visible"
 			android:layout_marginStart="@dimen/list_content_padding" />
 
@@ -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" />
 
 				<TextView
@@ -98,7 +99,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginRight="@dimen/gpx_small_icon_margin"
-					android:src="@drawable/ic_small_point"
+					osmand:srcCompat="@drawable/ic_action_waypoint_16"
 					android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
 
 				<TextView
@@ -116,7 +117,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginRight="@dimen/gpx_small_icon_margin"
-					android:src="@drawable/ic_small_time"
+					osmand:srcCompat="@drawable/ic_action_time_16"
 					android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
 
 				<TextView
@@ -163,7 +164,7 @@
 			android:layout_height="@dimen/list_item_height"
 			android:layout_marginLeft="@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"
 			android:layout_marginStart="@dimen/favorites_icon_right_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"/>
 
 		<ImageButton
@@ -182,7 +183,7 @@
 			android:layout_height="@dimen/list_item_height"
 			android:background="?attr/dashboard_button"
 			android:focusable="false"
-			android:src="@drawable/ic_overflow_menu_white"
+			osmand:srcCompat="@drawable/ic_overflow_menu_white"
 			android:visibility="gone"/>
 
 		<LinearLayout
@@ -220,4 +221,4 @@
 
 	</LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -26,7 +27,7 @@
             android:layout_gravity="center_vertical"
             android:scaleType="center"
         	android:paddingLeft="@dimen/list_content_padding"
-            android:src="@drawable/ic_action_start_navigation"
+            osmand:srcCompat="@drawable/ic_action_start_navigation"
             android:layout_marginRight="@dimen/favorites_icon_right_margin"
 	        android:layout_marginEnd="@dimen/favorites_icon_right_margin"
 	        android:paddingStart="@dimen/list_content_padding" />
@@ -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" />
 
         <ImageButton
@@ -60,7 +61,7 @@
             android:layout_gravity="center_vertical"
             android:background="?attr/dashboard_button"
             android:focusable="false"
-            android:src="@drawable/ic_action_remove_dark" />
+            osmand:srcCompat="@drawable/ic_action_remove_dark" />
     </LinearLayout>
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:osmand="http://schemas.android.com/apk/res-auto"
 			  xmlns:tools="http://schemas.android.com/tools"
 			  android:layout_width="match_parent"
 			  android:layout_height="match_parent"
@@ -26,7 +27,7 @@
 			android:layout_gravity="center_vertical"
 			android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
 			android:layout_marginRight="@dimen/dashFavIconMargin"
-			android:src="@drawable/ic_action_start_navigation"
+			osmand:srcCompat="@drawable/ic_action_start_navigation"
 			android:scaleType="center"
 			android:background="@drawable/btn_inset_circle_no_shadow"
 			android:layout_marginStart="@dimen/dashboard_parking_left_margin"
diff --git a/OsmAnd/res/layout/dash_simulate_item.xml b/OsmAnd/res/layout/dash_simulate_item.xml
index 8ae302ad65..cc4a0759dd 100644
--- a/OsmAnd/res/layout/dash_simulate_item.xml
+++ b/OsmAnd/res/layout/dash_simulate_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -34,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/list_content_padding"
             android:layout_marginTop="@dimen/favorites_icon_top_margin"
-            android:src="@drawable/ic_gpx_track"
+            osmand:srcCompat="@drawable/ic_action_polygom_dark"
             android:visibility="gone"
 	        android:layout_marginStart="@dimen/list_content_padding" />
 
@@ -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" />
     </LinearLayout>
 
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"/>
         </LinearLayout>
     </LinearLayout>
 
@@ -135,4 +135,4 @@
             osmand:typeface="@string/font_roboto_medium"/>
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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"/>
 
             <ImageView
@@ -46,7 +46,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/dashboard_button_light"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_navigation_drawer"
+                app:srcCompat="@drawable/ic_navigation_drawer"
                 tools:visibility="gone"/>
 
             <TextView
@@ -77,7 +77,7 @@
                 android:layout_gravity="end"
                 android:background="@drawable/dashboard_button_light"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_configure_screen_dark"/>
+                app:srcCompat="@drawable/ic_configure_screen_dark"/>
 
             <ImageView
                 android:id="@+id/toolbar_ok"
@@ -88,7 +88,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/dashboard_button_light"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_action_done"/>
+                app:srcCompat="@drawable/ic_action_done"/>
 
             <ImageView
                 android:id="@+id/toolbar_sort"
@@ -99,7 +99,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/dashboard_button_light"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_sort_waypoint_dark"/>
+                app:srcCompat="@drawable/ic_sort_waypoint_dark"/>
 
             <ImageView
                 android:id="@+id/toolbar_flat"
@@ -110,7 +110,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/dashboard_button_light"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_flat_list_dark"
+                app:srcCompat="@drawable/ic_flat_list_dark"
                 android:visibility="gone"/>
 
             <ImageView
@@ -122,7 +122,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/dashboard_button_light"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_action_edit_dark"
+                app:srcCompat="@drawable/ic_action_edit_dark"
                 android:visibility="gone"/>
         </LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:id="@+id/share_fragment_layout"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -35,7 +36,7 @@
                         android:layout_width="56dp"
                         android:layout_height="56dp"
                         android:scaleType="center"
-                        android:src="@drawable/list_destination"/>
+                        osmand:srcCompat="@drawable/list_destination"/>
 
                 </LinearLayout>
 
@@ -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"/>
 
                     </LinearLayout>
 
@@ -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" />
 
                     <View
                         android:layout_width="match_parent"
@@ -132,15 +133,15 @@
                         android:paddingBottom="12dp"
                         android:paddingLeft="8dp"
                         android:paddingRight="8dp"
-                        android:drawableLeft="@drawable/ic_action_done"
-                        android:drawablePadding="12dp"
+						osmand:drawableLeftCompat="@drawable/ic_action_done"
+						osmand:drawableStartCompat="@drawable/ic_action_done"
+						android:drawablePadding="12dp"
                         android:gravity="start|center_vertical"
                         android:textColor="?android:textColorPrimary"
                         style="@style/Widget.AppCompat.Button.Borderless"
                         android:text="@string/finish_navigation"
 	                    android:paddingEnd="8dp"
-	                    android:paddingStart="8dp"
-	                    android:drawableStart="@drawable/ic_action_done" />
+	                    android:paddingStart="8dp" />
 
                 </LinearLayout>
 
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" />
 
 </LinearLayout>
\ 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" />
 
 		</LinearLayout>
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" />
 
     <TextView
         android:id="@+id/title"
diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml
index f1699c775a..eacde936c2 100644
--- a/OsmAnd/res/layout/expandable_list_item_category.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category.xml
@@ -64,7 +64,7 @@
             android:background="?attr/dashboard_button"
             android:focusable="false"
             android:scaleType="center"
-            android:src="@drawable/ic_overflow_menu_white"
+            osmand:srcCompat="@drawable/ic_overflow_menu_white"
             android:visibility="gone"
             tools:visiblity="visible"
             android:layout_marginEnd="4dp" />
@@ -80,4 +80,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal">
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:orientation="horizontal">
 
     <Button
         android:id="@+id/button"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:drawableLeft="@drawable/ic_action_folder"
-        android:paddingLeft="10dp"
+		osmand:drawableLeftCompat="@drawable/ic_action_folder"
+		osmand:drawableStartCompat="@drawable/ic_action_folder"
+		android:paddingLeft="10dp"
         android:paddingRight="10dp"
         android:background="?attr/selectableItemBackground"
         android:text="Restaurant"
@@ -17,7 +19,6 @@
         android:textSize="@dimen/default_list_text_size"
         android:textAllCaps="false"
 	    android:paddingStart="10dp"
-	    android:paddingEnd="10dp"
-	    android:drawableStart="@drawable/ic_action_folder" />
+	    android:paddingEnd="10dp" />
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
@@ -95,7 +96,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:contentDescription="@string/show_view_angle"
-                    android:src="@drawable/ic_direction_arrow" />
+                    osmand:srcCompat="@drawable/ic_direction_arrow" />
 
                 <TextView
                     android:id="@+id/distance"
@@ -117,7 +118,7 @@
                     android:layout_marginStart="@dimen/list_item_button_padding"
                     android:layout_marginLeft="@dimen/list_item_button_padding"
                     android:contentDescription="@string/favorite_category_name"
-                    android:src="@drawable/ic_small_group" />
+                    osmand:srcCompat="@drawable/ic_action_group_name_16" />
 
                 <TextView
                     android:id="@+id/group_name"
@@ -140,7 +141,7 @@
             android:layout_marginLeft="@dimen/dashFavIconMargin"
             android:background="?attr/dashboard_button"
             android:contentDescription="@string/context_menu_item_directions_to"
-            android:src="@drawable/ic_action_test_light"
+            osmand:srcCompat="@drawable/ic_action_remove_dark"
             android:visibility="gone" />
 
         <ImageButton
@@ -150,7 +151,7 @@
             android:layout_gravity="center_vertical"
             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="gone" />
     </LinearLayout>
 
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 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/change_color_view"
     android:layout_width="match_parent"
@@ -19,7 +20,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="@dimen/route_info_icon_padding_right"
         android:layout_marginRight="@dimen/route_info_icon_padding_right"
-        android:src="@drawable/map_favorite" />
+        osmand:srcCompat="@drawable/map_favorite" />
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/OsmAnd/res/layout/first_usage_welcome_fragment.xml b/OsmAnd/res/layout/first_usage_welcome_fragment.xml
index 8060af3545..9386072048 100644
--- a/OsmAnd/res/layout/first_usage_welcome_fragment.xml
+++ b/OsmAnd/res/layout/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"/>
 
         <View
             android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/first_usage_wizard_fragment.xml b/OsmAnd/res/layout/first_usage_wizard_fragment.xml
index a77d8636de..1592b04145 100644
--- a/OsmAnd/res/layout/first_usage_wizard_fragment.xml
+++ b/OsmAnd/res/layout/first_usage_wizard_fragment.xml
@@ -30,7 +30,7 @@
                     android:layout_width="54dp"
                     android:layout_height="44dp"
                     android:scaleType="center"
-                    android:src="@drawable/ic_action_osmand_logo"
+                    osmand:srcCompat="@drawable/ic_action_osmand_logo"
                     android:tint="@color/osmand_orange"/>
 
                 <LinearLayout
@@ -107,7 +107,7 @@
                             android:layout_width="54dp"
                             android:layout_height="60dp"
                             android:scaleType="center"
-                            android:src="@drawable/ic_action_location_off"
+                            osmand:srcCompat="@drawable/ic_action_location_off"
                             android:tint="@color/icon_color_default_light"/>
 
                         <LinearLayout
@@ -188,7 +188,7 @@
                             android:layout_width="54dp"
                             android:layout_height="60dp"
                             android:scaleType="center"
-                            android:src="@drawable/ic_action_wifi_off"
+                            osmand:srcCompat="@drawable/ic_action_wifi_off"
                             android:tint="@color/icon_color_default_light"/>
 
                         <LinearLayout
@@ -446,7 +446,7 @@
                             android:layout_width="54dp"
                             android:layout_height="60dp"
                             android:scaleType="center"
-                            android:src="@drawable/ic_map"
+                            osmand:srcCompat="@drawable/ic_map"
                             android:tint="@color/icon_color_default_light"/>
 
                         <LinearLayout
@@ -549,7 +549,7 @@
                             android:layout_width="54dp"
                             android:layout_height="60dp"
                             android:scaleType="center"
-                            android:src="@drawable/ic_map"
+                            osmand:srcCompat="@drawable/ic_map"
                             android:tint="@color/icon_color_default_light"/>
 
                         <LinearLayout
@@ -596,7 +596,7 @@
                                     android:layout_width="44dp"
                                     android:layout_height="60dp"
                                     android:contentDescription="@string/shared_string_cancel"
-                                    android:src="@drawable/ic_action_refresh_dark"
+                                    osmand:srcCompat="@drawable/ic_action_refresh_dark"
                                     android:tint="@color/map_widget_blue"
                                     android:visibility="gone"/>
 
@@ -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"/>
 
                             </LinearLayout>
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 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -53,7 +54,7 @@
                 style="@style/Widget.AppCompat.Button.Borderless"
                 android:layout_width="44dp"
                 android:layout_height="44dp"
-                android:src="@drawable/ic_action_remove_dark"
+                osmand:srcCompat="@drawable/ic_action_remove_dark"
                 tools:background="@color/color_warning"/>
 
         </LinearLayout>
@@ -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 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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"/>
 
     </FrameLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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"/>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/poiTypeTextInputLayout"
@@ -177,4 +177,4 @@
             app:textAllCapsCompat="true"
             tools:text="Save"/>
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ 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" />
 
 	</com.google.android.material.appbar.AppBarLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ 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" />
 
     <LinearLayout
         android:id="@+id/mapillary_filters_linear_layout"
@@ -34,7 +34,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:layout_margin="@dimen/content_padding"
-                tools:src="@drawable/ic_action_gabout_dark" />
+                tools:src="@drawable/ic_action_info_dark" />
 
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/toggle_row_toggle"
@@ -476,4 +476,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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"/>
         </FrameLayout>
 
         <LinearLayout
@@ -223,7 +223,8 @@
                     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:ellipsize="end"
                     android:maxLines="1"
                     android:minHeight="@dimen/measurement_tool_button_height"
@@ -231,7 +232,6 @@
                     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" />
             </FrameLayout>
@@ -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" />
         </LinearLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -18,7 +19,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"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -46,4 +47,4 @@
 
     </LinearLayout>
 
-</FrameLayout>
+</FrameLayout>
\ 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"/>
 
                 <Spinner
                     android:id="@+id/monthReportsSpinner"
@@ -51,7 +51,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginRight="16dp"
-                    android:src="@drawable/ic_action_arrow_drop_down"
+                    osmand:srcCompat="@drawable/ic_action_arrow_drop_down"
 	                android:layout_marginEnd="16dp" />
 
             </LinearLayout>
@@ -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"/>
 
                 <LinearLayout
                     android:layout_width="0dp"
@@ -110,7 +110,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginRight="16dp"
-                    android:src="@drawable/ic_action_arrow_drop_down"
+                    osmand:srcCompat="@drawable/ic_action_arrow_drop_down"
 	                android:layout_marginEnd="16dp" />
 
             </LinearLayout>
@@ -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"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -203,7 +203,7 @@
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:scaleType="center"
-                    android:src="@drawable/ic_map"/>
+                    osmand:srcCompat="@drawable/ic_map"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -250,7 +250,7 @@
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:scaleType="center"
-                    android:src="@drawable/ic_action_bitcoin"/>
+                    osmand:srcCompat="@drawable/ic_action_bitcoin"/>
 
                 <LinearLayout
                     android:id="@+id/donationsLayout"
@@ -306,7 +306,7 @@
                         android:layout_width="56dp"
                         android:layout_height="56dp"
                         android:scaleType="center"
-                        android:src="@drawable/ic_action_bitcoin"/>
+                        osmand:srcCompat="@drawable/ic_action_bitcoin"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -358,7 +358,7 @@
                     android:layout_width="56dp"
                     android:layout_height="60dp"
                     android:scaleType="center"
-                    android:src="@drawable/ic_group"/>
+                    osmand:srcCompat="@drawable/ic_group"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/fragment_search_list.xml b/OsmAnd/res/layout/fragment_search_list.xml
index bc0eea6acc..c334045af0 100644
--- a/OsmAnd/res/layout/fragment_search_list.xml
+++ b/OsmAnd/res/layout/fragment_search_list.xml
@@ -1,4 +1,5 @@
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -18,7 +19,7 @@
             style="@style/Widget.AppCompat.Button.Borderless"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:src="@drawable/ic_action_remove_dark"/>
+            osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
         <EditText
             android:id="@+id/searchEditText"
@@ -46,4 +47,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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" />
 
 		<LinearLayout
@@ -75,7 +75,7 @@
 				android:background="@drawable/btn_circle_transparent_full"
 				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" />
 
 			<androidx.appcompat.widget.AppCompatImageButton
@@ -85,7 +85,7 @@
 				android:background="@drawable/btn_circle_transparent_full"
 				android:contentDescription="@string/shared_string_save_as_gpx"
 				android:scaleType="center"
-				android:src="@drawable/ic_action_gsave_dark"
+				osmand:srcCompat="@drawable/ic_action_gsave_dark"
 				android:tint="?attr/text_color_tab_active_white" />
 
 			<androidx.appcompat.widget.AppCompatImageButton
@@ -95,7 +95,7 @@
 				android:background="@drawable/btn_circle_transparent_full"
 				android:contentDescription="@string/share_route_as_gpx"
 				android:scaleType="center"
-				android:src="@drawable/ic_action_gshare_dark"
+				osmand:srcCompat="@drawable/ic_action_gshare_dark"
 				android:tint="?attr/text_color_tab_active_white" />
 
 		</LinearLayout>
@@ -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" />
 
 				<androidx.appcompat.widget.AppCompatImageView
@@ -193,7 +193,7 @@
 					android:background="?attr/selectableItemBackgroundBorderless"
 					android:contentDescription="@string/shared_string_save_as_gpx"
 					android:scaleType="center"
-					android:src="@drawable/ic_action_gsave_dark"
+					osmand:srcCompat="@drawable/ic_action_gsave_dark"
 					android:tint="?attr/text_color_tab_active_white" />
 
 				<androidx.appcompat.widget.AppCompatImageView
@@ -203,7 +203,7 @@
 					android:background="?attr/selectableItemBackgroundBorderless"
 					android:contentDescription="@string/share_route_as_gpx"
 					android:scaleType="center"
-					android:src="@drawable/ic_action_gshare_dark"
+					osmand:srcCompat="@drawable/ic_action_gshare_dark"
 					android:tint="?attr/text_color_tab_active_white" />
 
 			</LinearLayout>
@@ -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" />
 
 	</LinearLayout>
 
@@ -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" />
 
 		<LinearLayout
 			android:layout_width="wrap_content"
@@ -281,7 +281,7 @@
 				android:layout_height="@dimen/map_button_size"
 				android:background="@drawable/btn_circle"
 				android:contentDescription="@string/zoomIn"
-				tools:src="@drawable/ic_action_test_light" />
+				tools:src="@drawable/ic_action_remove_dark" />
 
 			<ImageButton
 				android:id="@+id/map_zoom_out_button"
@@ -290,7 +290,7 @@
 				android:layout_marginTop="@dimen/map_button_spacing"
 				android:background="@drawable/btn_circle"
 				android:contentDescription="@string/zoomOut"
-				tools:src="@drawable/ic_action_test_light" />
+				tools:src="@drawable/ic_action_remove_dark" />
 
 		</LinearLayout>
 
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"/>
 
         <net.osmand.plus.widgets.TextViewEx
             android:id="@+id/titleTextView"
diff --git a/OsmAnd/res/layout/fragment_terrain.xml b/OsmAnd/res/layout/fragment_terrain.xml
index 473a49da3e..928e0fc7ba 100644
--- a/OsmAnd/res/layout/fragment_terrain.xml
+++ b/OsmAnd/res/layout/fragment_terrain.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
@@ -18,7 +17,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" />
 
 		<LinearLayout
 			android:background="?attr/activity_background_basic"
@@ -98,7 +97,7 @@
 						android:layout_height="@dimen/dialog_button_height"
 						android:layout_marginStart="@dimen/content_padding"
 						android:layout_marginEnd="@dimen/content_padding"
-						android:background="@drawable/btn_bg_border_inactive"
+						android:background="?attr/btn_bg_border_inactive"
 						android:baselineAligned="false"
 						android:orientation="horizontal">
 
@@ -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" />
 
 						</FrameLayout>
 
@@ -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" />
 
 						</FrameLayout>
 
@@ -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" />
 
 					<net.osmand.plus.widgets.TextViewEx
 						android:id="@+id/slope_read_more_tv"
@@ -429,7 +428,7 @@
 						android:layout_height="match_parent"
 						android:adjustViewBounds="true"
 						android:scaleType="fitCenter"
-						android:src="@drawable/img_empty_state_terrain" />
+						osmand:srcCompat="@drawable/img_empty_state_terrain" />
 
 					<LinearLayout
 						android:layout_width="match_parent"
@@ -487,6 +486,7 @@
 					android:lineSpacingExtra="@dimen/line_spacing_extra_description"
 					android:textColor="?android:textColorSecondary"
 					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_regular"
 					tools:text="@string/terrain_empty_state_text" />
 
 			</LinearLayout>
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" />
 
 			<TextView
@@ -121,4 +121,4 @@
 
 		</LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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" />
 
 		<LinearLayout
 			android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml b/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
index af4811be70..98ab7978d1 100644
--- a/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
+++ b/OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
@@ -35,7 +35,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" />
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/toolbar_title"
diff --git a/OsmAnd/res/layout/go_to_map_fragment.xml b/OsmAnd/res/layout/go_to_map_fragment.xml
index 6d9ccaf740..941f627997 100644
--- a/OsmAnd/res/layout/go_to_map_fragment.xml
+++ b/OsmAnd/res/layout/go_to_map_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -65,7 +66,7 @@
                         android:layout_gravity="center"
                         style="@style/Widget.AppCompat.Button.Borderless"
                         tools:background="@color/color_warning"
-                        android:src="@drawable/ic_action_remove_dark"/>
+                        osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
                 </LinearLayout>
 
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"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -123,7 +123,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"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -221,7 +221,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_action_altitude_ascent"/>
+                    osmand:srcCompat="@drawable/ic_action_altitude_ascent"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -267,7 +267,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_action_altitude_descent"/>
+                    osmand:srcCompat="@drawable/ic_action_altitude_descent"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -365,4 +365,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -123,7 +123,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_action_time_start"/>
+                    osmand:srcCompat="@drawable/ic_action_time_start"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -221,7 +221,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_action_time_start"/>
+                    osmand:srcCompat="@drawable/ic_action_time_start"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -276,7 +276,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_action_time_start"/>
+                    osmand:srcCompat="@drawable/ic_action_time_start"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -383,4 +383,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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"/>
 
         </LinearLayout>
 
@@ -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"/>
 
             </LinearLayout>
 
@@ -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" />
 
             </LinearLayout>
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"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -123,7 +123,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_action_max_speed"/>
+                    osmand:srcCompat="@drawable/ic_action_max_speed"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -221,7 +221,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
-                    android:src="@drawable/ic_action_time_span"/>
+                    osmand:srcCompat="@drawable/ic_action_time_span"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -267,7 +267,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"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -365,4 +365,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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" />
 
 	</LinearLayout>
 
@@ -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" />
 
 	</LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -44,7 +45,7 @@
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_action_polygom_dark"
+            osmand:srcCompat="@drawable/ic_action_polygom_dark"
             android:layout_marginRight="@dimen/list_content_padding"
             android:visibility="visible"
 	        android:layout_marginEnd="@dimen/list_content_padding" />
@@ -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" />
 
                 <TextView
                     android:id="@+id/distance"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_text_margin"
+                    android:maxLines="1"
                     android:includeFontPadding="false"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_sub_text_size"
@@ -102,7 +104,7 @@
                     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_point" />
+                    osmand:srcCompat="@drawable/ic_action_waypoint_16" />
 
                 <TextView
                     android:id="@+id/points_count"
@@ -110,6 +112,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_text_margin"
                     android:includeFontPadding="false"
+                    android:maxLines="1"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_sub_text_size"
 	                android:layout_marginEnd="@dimen/gpx_small_text_margin" />
@@ -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" />
 
                 <TextView
                     android:id="@+id/time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/gpx_small_text_margin"
+                    android:maxLines="1"
                     android:textColor="?android:textColorSecondary"
                     android:includeFontPadding="false"
                     android:textSize="@dimen/default_sub_text_size"
@@ -146,7 +150,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="?android:textColorSecondary"
-                    android:textSize="@dimen/default_sub_text_size"/>
+                    android:maxLines="1"
+                    android:textSize="@dimen/default_sub_text_size" />
 
             </LinearLayout>
 
@@ -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" />
 
         <ImageButton
@@ -175,7 +180,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"/>
 
         <ImageButton
@@ -185,7 +190,7 @@
             android:layout_height="@dimen/list_item_height"
             android:background="?attr/dashboard_button"
             android:focusable="false"
-            android:src="@drawable/ic_overflow_menu_white"
+            osmand:srcCompat="@drawable/ic_overflow_menu_white"
             android:visibility="gone"/>
 
         <LinearLayout
@@ -225,4 +230,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -16,7 +17,7 @@
 		android:layout_marginEnd="@dimen/list_content_padding"
 		android:layout_marginRight="@dimen/list_content_padding"
 		android:layout_gravity="center_vertical"
-		android:src="@drawable/ic_action_polygom_dark"
+		osmand:srcCompat="@drawable/ic_action_polygom_dark"
 		android:visibility="visible"
 		android:contentDescription="@string/shared_string_icon" />
 
@@ -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" />
 
 			<TextView
@@ -75,7 +76,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_waypoint_16"
+				osmand:srcCompat="@drawable/ic_action_waypoint_16"
 				android:contentDescription="@string/track_points" />
 
 			<TextView
@@ -94,7 +95,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_time_16"
+				osmand:srcCompat="@drawable/ic_action_time_16"
 				android:contentDescription="@string/shared_string_time_moving" />
 
 			<TextView
@@ -124,4 +125,4 @@
 
 		</LinearLayout>
 	</LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -66,7 +67,7 @@
 					android:layout_marginTop="1dp"
 					android:layout_marginEnd="4dp"
 					android:layout_marginRight="4dp"
-					android:src="@drawable/ic_small_group" />
+					osmand:srcCompat="@drawable/ic_action_group_name_16" />
 
 				<TextView
 					android:id="@+id/subtitle"
diff --git a/OsmAnd/res/layout/home_work_card.xml b/OsmAnd/res/layout/home_work_card.xml
index 75587bef87..a2703cd3c0 100644
--- a/OsmAnd/res/layout/home_work_card.xml
+++ b/OsmAnd/res/layout/home_work_card.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/home_work_card"
 	android:layout_width="match_parent"
@@ -49,7 +50,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_home_dark"
+				osmand:srcCompat="@drawable/ic_action_home_dark"
 				android:tint="@color/description_font_and_bottom_sheet_icons" />
 
 			<LinearLayout
@@ -115,7 +116,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_work"
+				osmand:srcCompat="@drawable/ic_action_work"
 				android:tint="@color/description_font_and_bottom_sheet_icons" />
 
 			<LinearLayout
@@ -165,7 +166,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" />
 
 	</LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               android:minHeight="@dimen/list_item_height"
@@ -19,7 +20,7 @@
         android:layout_marginRight="@dimen/list_content_padding"
         android:gravity="center_vertical"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_action_settings"
+        osmand:srcCompat="@drawable/ic_action_settings"
 	    android:layout_marginEnd="@dimen/list_content_padding" />
 
     <TextView
diff --git a/OsmAnd/res/layout/list_item_description_with_image.xml b/OsmAnd/res/layout/list_item_description_with_image.xml
index 72f94ed955..ac546da7b6 100644
--- a/OsmAnd/res/layout/list_item_description_with_image.xml
+++ b/OsmAnd/res/layout/list_item_description_with_image.xml
@@ -10,21 +10,21 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:background="?attr/activity_background_basic"
-		tools:paddingEnd="56dp"
-		tools:paddingStart="56dp"
 		tools:paddingTop="16dp">
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/device_image"
-			android:layout_width="match_parent"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_gravity="center"
 			android:adjustViewBounds="true"
 			tools:src="@drawable/img_settings_device_top_dark" />
 
-		<ImageView
+		<androidx.appcompat.widget.AppCompatImageView
 			android:id="@+id/image"
-			android:layout_width="match_parent"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_gravity="center"
 			android:adjustViewBounds="true"
 			tools:src="@drawable/img_settings_customize_configure_map_night" />
 
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" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_margin="16dp"
-                tools:src="@drawable/ic_action_gabout_dark" />
+                tools:src="@drawable/ic_action_info_dark" />
 
             <View
                 android:id="@+id/divider_vertical"
diff --git a/OsmAnd/res/layout/list_item_icon_and_menu.xml b/OsmAnd/res/layout/list_item_icon_and_menu.xml
index d0703ebb18..e8e266e91d 100644
--- a/OsmAnd/res/layout/list_item_icon_and_menu.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_menu.xml
@@ -17,7 +17,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="@dimen/content_padding"
         android:layout_marginStart="@dimen/content_padding"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        tools:src="@drawable/ic_action_info_dark"/>
 
     <LinearLayout
         android:id="@+id/text_wrapper"
@@ -71,7 +71,7 @@
         android:layout_margin="@dimen/content_padding"
         android:layout_toLeftOf="@+id/toggle_item"
         android:layout_toStartOf="@+id/toggle_item"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        tools:src="@drawable/ic_action_info_dark"/>
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/toggle_item"
diff --git a/OsmAnd/res/layout/list_item_icon_and_menu_wide.xml b/OsmAnd/res/layout/list_item_icon_and_menu_wide.xml
index aef1c4fd5d..cc690eaddb 100644
--- a/OsmAnd/res/layout/list_item_icon_and_menu_wide.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_menu_wide.xml
@@ -17,7 +17,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        tools:src="@drawable/ic_action_info_dark"/>
 
     <LinearLayout
         android:id="@+id/text_wrapper"
@@ -70,7 +70,7 @@
         android:layout_margin="16dp"
         android:layout_toLeftOf="@+id/toggle_item"
         android:layout_toStartOf="@+id/toggle_item"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        tools:src="@drawable/ic_action_info_dark"/>
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/toggle_item"
diff --git a/OsmAnd/res/layout/list_item_icon_and_right_btn.xml b/OsmAnd/res/layout/list_item_icon_and_right_btn.xml
index 028553c047..48b1f5c58f 100644
--- a/OsmAnd/res/layout/list_item_icon_and_right_btn.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_right_btn.xml
@@ -18,7 +18,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="@dimen/content_padding"
         android:layout_marginStart="@dimen/content_padding"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        tools:src="@drawable/ic_action_info_dark"/>
 
     <LinearLayout
         android:id="@+id/text_wrapper"
@@ -72,7 +72,7 @@
         android:layout_toLeftOf="@+id/toggle_item"
         android:layout_toStartOf="@+id/toggle_item"
         android:visibility="gone"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        tools:src="@drawable/ic_action_info_dark"/>
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/toggle_item"
diff --git a/OsmAnd/res/layout/list_item_icon_and_switch.xml b/OsmAnd/res/layout/list_item_icon_and_switch.xml
index 1610b95ebb..c5920eb9fb 100644
--- a/OsmAnd/res/layout/list_item_icon_and_switch.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_switch.xml
@@ -20,7 +20,7 @@
             android:layout_height="@dimen/standard_icon_size"
             android:layout_marginStart="@dimen/content_padding"
             android:layout_marginLeft="@dimen/content_padding"
-            tools:src="@drawable/ic_action_gabout_dark" />
+            tools:src="@drawable/ic_action_info_dark" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title"
diff --git a/OsmAnd/res/layout/list_item_move_header.xml b/OsmAnd/res/layout/list_item_move_header.xml
index cab0bff4ea..d977c6ed1e 100644
--- a/OsmAnd/res/layout/list_item_move_header.xml
+++ b/OsmAnd/res/layout/list_item_move_header.xml
@@ -32,7 +32,7 @@
 			android:paddingBottom="@dimen/bottom_sheet_icon_margin"
 			android:visibility="gone"
 			tools:visibility="visible"
-			android:src="@drawable/ic_action_item_move"
+			osmand:srcCompat="@drawable/ic_action_item_move"
 			android:tint="?attr/secondary_icon_color" />
 
 		<LinearLayout
@@ -85,7 +85,7 @@
 			tools:visibility="visible"
 			android:paddingRight="@dimen/content_padding"
 			android:paddingBottom="@dimen/bottom_sheet_icon_margin"
-			android:src="@drawable/ic_action_item_move"
+			osmand:srcCompat="@drawable/ic_action_item_move"
 			android:tint="?attr/secondary_icon_color" />
 
 	</LinearLayout>
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">
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
 		android:layout_marginStart="@dimen/content_padding"
 		android:layout_marginLeft="@dimen/content_padding"
 		android:layout_marginEnd="@dimen/list_content_padding_large"
diff --git a/OsmAnd/res/layout/list_shadow_footer.xml b/OsmAnd/res/layout/list_shadow_footer.xml
index 3d1697e5e4..0a9f9c620b 100644
--- a/OsmAnd/res/layout/list_shadow_footer.xml
+++ b/OsmAnd/res/layout/list_shadow_footer.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:id="@+id/bottomShadowView"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -10,7 +11,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"/>
 
     <View
         android:id="@+id/bottomMarginView"
diff --git a/OsmAnd/res/layout/list_shadow_header.xml b/OsmAnd/res/layout/list_shadow_header.xml
index 91f11ab633..3037482c65 100644
--- a/OsmAnd/res/layout/list_shadow_header.xml
+++ b/OsmAnd/res/layout/list_shadow_header.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:id="@+id/topShadowView"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -14,6 +15,6 @@
         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"/>
 
 </LinearLayout>
\ 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 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_action_osm_live"/>
+                app:srcCompat="@drawable/ic_action_osm_live"/>
 
             <net.osmand.plus.widgets.TextViewEx
                 android:layout_width="wrap_content"
@@ -151,7 +151,7 @@
                     android:id="@+id/statusIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_action_done"/>
+                    app:srcCompat="@drawable/ic_action_done"/>
 
             </LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -30,7 +31,7 @@
         android:layout_marginEnd="@dimen/favorites_icon_right_margin"
         android:layout_marginRight="@dimen/favorites_icon_right_margin"
         android:focusable="false"
-        android:src="@drawable/ic_gpx_track" />
+        osmand:srcCompat="@drawable/ic_action_polygom_dark" />
 
     <LinearLayout
         android:layout_width="0dp"
@@ -74,6 +75,6 @@
         android:background="?attr/dashboard_button"
         android:contentDescription="@string/shared_string_more"
         android:focusable="false"
-        android:src="@drawable/ic_overflow_menu_white" />
+        osmand:srcCompat="@drawable/ic_overflow_menu_white" />
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -18,7 +19,7 @@
         android:layout_marginEnd="@dimen/favorites_icon_right_margin"
         android:focusable="false"
         android:layout_centerVertical="true"
-        android:src="@drawable/ic_map"
+        osmand:srcCompat="@drawable/ic_map"
         android:contentDescription="@string/map_downloaded" />
 
     <LinearLayout
@@ -77,7 +78,7 @@
         android:layout_gravity="center_vertical"
         android:background="?attr/dashboard_button"
         android:focusable="false"
-        android:src="@drawable/ic_overflow_menu_white" />
+        osmand:srcCompat="@drawable/ic_overflow_menu_white" />
 
     <View
         android:id="@+id/divider"
diff --git a/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml b/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml
index 10d92f439e..cadb783a59 100644
--- a/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml
+++ b/OsmAnd/res/layout/main_menu_drawer_btn_switch_profile.xml
@@ -79,7 +79,7 @@
 				android:layout_gravity="center"
 				android:layout_marginLeft="@dimen/content_padding_half"
 				android:layout_marginRight="@dimen/favorites_icon_right_margin"
-				android:src="@drawable/ic_action_arrow_drop_down"
+				osmand:srcCompat="@drawable/ic_action_arrow_drop_down"
 				android:tint="?attr/default_icon_color"
 				android:layout_marginStart="@dimen/content_padding_half"
 				android:layout_marginEnd="@dimen/favorites_icon_right_margin" />
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" />
 
 	<net.osmand.plus.widgets.TextViewEx
 		android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index a57bfdb4ad..569d3ac3af 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -70,7 +70,7 @@
                     android:layout_width="@dimen/map_widget_icon"
                     android:layout_height="@dimen/map_widget_icon"
                     android:layout_marginTop="@dimen/context_menu_padding_margin_default"
-                    android:src="@drawable/ic_action_building_number"/>
+                    osmand:srcCompat="@drawable/ic_action_building_number"/>
 
             </LinearLayout>
 
@@ -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"/>
 
     </FrameLayout>
@@ -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"/>
 
                 <TextView
@@ -612,7 +612,7 @@
                 android:layout_height="@dimen/map_button_size"
                 android:background="@drawable/btn_circle"
                 android:contentDescription="@string/zoomIn"
-                tools:src="@drawable/ic_action_test_light"/>
+                tools:src="@drawable/ic_action_remove_dark"/>
 
             <ImageButton
                 android:id="@+id/context_menu_zoom_out_button"
@@ -621,7 +621,7 @@
                 android:layout_marginTop="@dimen/map_button_spacing"
                 android:background="@drawable/btn_circle"
                 android:contentDescription="@string/zoomOut"
-                tools:src="@drawable/ic_action_test_light"/>
+                tools:src="@drawable/ic_action_remove_dark"/>
         </LinearLayout>
 
     </FrameLayout>
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"/>
 
     </FrameLayout>-->
 
@@ -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"/>
 
             <TextView
                 android:id="@+id/map_alarm_warning_text"
@@ -123,7 +123,7 @@
                 android:layout_height="@dimen/map_button_size"
                 android:background="@drawable/btn_round"
                 android:contentDescription="@string/backToMenu"
-                tools:src="@drawable/ic_action_test_light"/>
+                tools:src="@drawable/ic_action_remove_dark"/>
 
             <ImageButton
                 android:id="@+id/map_route_info_button"
@@ -133,7 +133,7 @@
 	            android:layout_marginStart="@dimen/map_button_spacing"
                 android:background="@drawable/btn_round"
                 android:contentDescription="@string/layer_route"
-                tools:src="@drawable/ic_action_test_light"/>
+                tools:src="@drawable/ic_action_remove_dark"/>
 
             <ImageButton
                 android:id="@+id/snap_to_road_image_button"
@@ -142,7 +142,7 @@
                 android:layout_gravity="bottom"
                 android:background="@drawable/btn_circle"
                 android:visibility="gone"
-                tools:src="@drawable/ic_action_test_light"/>
+                tools:src="@drawable/ic_action_remove_dark"/>
 
             <FrameLayout
                 android:id="@+id/map_ruler_layout"
@@ -204,7 +204,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"/>
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -220,7 +220,7 @@
                     android:layout_height="@dimen/map_button_size"
                     android:background="@drawable/btn_circle"
                     android:contentDescription="@string/zoomIn"
-                    tools:src="@drawable/ic_action_test_light"/>
+                    tools:src="@drawable/ic_action_remove_dark"/>
 
                 <ImageButton
                     android:id="@+id/map_zoom_out_button"
@@ -229,7 +229,7 @@
                     android:layout_marginTop="@dimen/map_button_spacing"
                     android:background="@drawable/btn_circle"
                     android:contentDescription="@string/zoomOut"
-                    tools:src="@drawable/ic_action_test_light"/>
+                    tools:src="@drawable/ic_action_remove_dark"/>
             </LinearLayout>
         </LinearLayout>
 
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"/>
     </FrameLayout>
 
     <net.osmand.plus.quickaction.QuickActionsWidget
diff --git a/OsmAnd/res/layout/map_hud_top.xml b/OsmAnd/res/layout/map_hud_top.xml
index f9ca912bea..8f05635a5a 100644
--- a/OsmAnd/res/layout/map_hud_top.xml
+++ b/OsmAnd/res/layout/map_hud_top.xml
@@ -47,7 +47,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" />
 
 				<TextView
 					android:id="@+id/lat_coordinates"
@@ -90,7 +90,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_longitude_day" />
+					osmand:srcCompat="@drawable/widget_coordinates_longitude_day" />
 
 				<TextView
 					android:id="@+id/lon_coordinates"
@@ -210,7 +210,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="@dimen/map_button_margin"
                     android:layout_marginRight="@dimen/map_button_margin"
-                    tools:src="@drawable/ic_action_test_light"
+                    tools:src="@drawable/ic_action_remove_dark"
 	                android:layout_marginStart="@dimen/map_button_margin"
 	                android:layout_marginEnd="@dimen/map_button_margin" />
 
@@ -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"/>
 
                 <ImageButton
                     android:id="@+id/waypoint_close"
@@ -295,7 +295,7 @@
                     android:layout_height="@dimen/map_address_height"
                     android:background="@drawable/bottom_shadow"
                     android:layout_gravity="center_vertical"
-                    tools:src="@drawable/ic_action_test_light"/>
+                    tools:src="@drawable/ic_action_remove_dark"/>
             </LinearLayout>
         </FrameLayout>
 
@@ -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"/>
 
                 <LinearLayout
                     android:id="@+id/widget_top_bar_title_layout"
@@ -388,7 +388,7 @@
                     android:layout_height="56dp"
                     android:layout_gravity="top"
                     android:contentDescription="@string/shared_string_refresh"
-                    android:src="@drawable/ic_action_refresh_dark"
+                    osmand:srcCompat="@drawable/ic_action_refresh_dark"
                     android:visibility="gone"/>
 
                 <ImageButton
@@ -398,7 +398,7 @@
                     android:layout_height="56dp"
                     android:layout_gravity="top"
                     android:contentDescription="@string/shared_string_close"
-                    android:src="@drawable/ic_action_remove_dark"/>
+                    osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/widget_top_bar_save"
@@ -485,7 +485,7 @@
                             android:id="@+id/map_marker_arrow"
                             android:layout_width="66dp"
                             android:layout_height="36dp"
-                            android:src="@drawable/ic_arrow_marker_diretion"/>
+                            osmand:srcCompat="@drawable/ic_arrow_marker_diretion"/>
 
                         <LinearLayout
                             android:layout_width="0dp"
@@ -529,7 +529,7 @@
                             android:layout_width="50dp"
                             android:layout_height="50dp"
                             android:background="?attr/selectableItemBackgroundBorderless"
-                            android:src="@drawable/ic_action_markers_list"/>
+                            osmand:srcCompat="@drawable/ic_action_markers_list"/>
 
                     </LinearLayout>
 
@@ -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"/>
 
                         <RelativeLayout
                             android:layout_width="0dp"
@@ -678,7 +678,7 @@
                             android:layout_height="@dimen/map_small_button_size"
                             android:background="@drawable/btn_inset_circle_trans"
                             android:contentDescription="@string/configure_map"
-                            tools:src="@drawable/ic_action_test_light"/>
+                            tools:src="@drawable/ic_action_remove_dark"/>
 
                         <ImageButton
                             android:id="@+id/map_compass_button"
@@ -687,7 +687,7 @@
                             android:layout_marginTop="@dimen/map_small_button_margin"
                             android:background="@drawable/btn_inset_circle_trans"
                             android:contentDescription="@string/map_widget_compass"
-                            tools:src="@drawable/ic_action_test_light"/>
+                            tools:src="@drawable/ic_action_remove_dark"/>
 
                     </LinearLayout>
 
@@ -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"/>
                 </LinearLayout>
             </LinearLayout>
             <!-- empty block to not let widgets grow more than 45% -->
@@ -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"/>
                 </LinearLayout>
             </FrameLayout>
         </LinearLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widget_bg"
@@ -32,7 +33,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="2dp"
             android:gravity="center"
-            android:src="@drawable/ic_action_test_light"
+            osmand:srcCompat="@drawable/ic_action_remove_dark"
             android:visibility="gone"/>
     </FrameLayout>
 
@@ -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 a7d6a62f65..eae3f73bfe 100644
--- a/OsmAnd/res/layout/map_marker_item.xml
+++ b/OsmAnd/res/layout/map_marker_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/package_delivered_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
@@ -24,7 +25,7 @@
         android:layout_width="56dp"
         android:layout_height="25dp"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_action_fav_dark"/>
+        osmand:srcCompat="@drawable/ic_action_fav_dark"/>
 
     <LinearLayout
         android:layout_width="0dp"
@@ -55,7 +56,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="4dp"
-                android:src="@drawable/ic_direction_arrow"
+                osmand:srcCompat="@drawable/ic_direction_arrow"
                 android:visibility="gone"
 	            android:layout_marginEnd="4dp" />
 
@@ -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" />
 
     <ImageView
@@ -146,7 +147,7 @@
         android:clickable="false"
         android:focusable="false"
         android:scaleType="center"
-        android:src="@drawable/ic_flat_list_dark"
+        osmand:srcCompat="@drawable/ic_flat_list_dark"
         android:visibility="gone"
 	    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 d805a97049..81e701e618 100644
--- a/OsmAnd/res/layout/map_marker_item_new.xml
+++ b/OsmAnd/res/layout/map_marker_item_new.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -12,7 +13,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"
         android:visibility="gone"
         tools:visibility="visible"/>
 
@@ -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"/>
 
             <View
                 android:id="@+id/flag_icon_left_space"
@@ -196,4 +197,4 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
-</LinearLayout>
+</LinearLayout>
\ 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"/>
 
         <net.osmand.plus.widgets.TextViewEx
             android:id="@+id/titleTextView"
diff --git a/OsmAnd/res/layout/mapillary_first_dialog.xml b/OsmAnd/res/layout/mapillary_first_dialog.xml
index 4bb0605d53..c9d43ccd1d 100644
--- a/OsmAnd/res/layout/mapillary_first_dialog.xml
+++ b/OsmAnd/res/layout/mapillary_first_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_gravity="bottom"
@@ -26,7 +27,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:layout_marginLeft="16dp"
-                    android:src="@drawable/ic_action_mapillary"
+                    osmand:srcCompat="@drawable/ic_action_mapillary"
                     android:tint="@color/mapillary_color"
 	                android:layout_marginStart="16dp" />
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:orientation="vertical">
@@ -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"/>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/mapillary_static_image_view.xml b/OsmAnd/res/layout/mapillary_static_image_view.xml
index 54207ea752..93128ddd98 100644
--- a/OsmAnd/res/layout/mapillary_static_image_view.xml
+++ b/OsmAnd/res/layout/mapillary_static_image_view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:osmand="http://schemas.android.com/apk/res-auto"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
@@ -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"/>
 
             <View
                 android:layout_width="0dp"
@@ -45,7 +46,7 @@
                 android:layout_width="44dp"
                 android:layout_height="44dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_arrow_forward"/>
+                osmand:srcCompat="@drawable/ic_arrow_forward"/>
 
         </LinearLayout>
 
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"/>
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/measure_point_icon"
diff --git a/OsmAnd/res/layout/menu_obj_list_item.xml b/OsmAnd/res/layout/menu_obj_list_item.xml
index fdd7f35080..16ac2b095c 100644
--- a/OsmAnd/res/layout/menu_obj_list_item.xml
+++ b/OsmAnd/res/layout/menu_obj_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               xmlns:tools="http://schemas.android.com/tools"
@@ -55,7 +56,7 @@
                 android:id="@+id/context_menu_icon_view"
                 android:layout_width="@dimen/standard_icon_size"
                 android:layout_height="@dimen/standard_icon_size"
-                android:src="@drawable/ic_action_building_number"/>
+                osmand:srcCompat="@drawable/ic_action_building_number"/>
 
         </LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/move_marker_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -16,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/content_padding"
-        android:src="@drawable/ic_action_photo_dark"/>
+        osmand:srcCompat="@drawable/ic_action_photo_dark"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/my_places_fabs.xml b/OsmAnd/res/layout/my_places_fabs.xml
index b7c60e64e7..f7b32cac25 100644
--- a/OsmAnd/res/layout/my_places_fabs.xml
+++ b/OsmAnd/res/layout/my_places_fabs.xml
@@ -14,7 +14,7 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:contentDescription="@string/quick_action_new_action"
-        android:src="@drawable/ic_action_plus"
+        app:srcCompat="@drawable/ic_action_plus"
         app:backgroundTint="?attr/active_color_basic"
         app:fabSize="normal"
         app:useCompatPadding="true"/>
@@ -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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:osmand="http://schemas.android.com/apk/res-auto"
 			  xmlns:tools="http://schemas.android.com/tools"
 			  android:layout_width="fill_parent"
 			  android:layout_height="wrap_content"
@@ -40,7 +41,7 @@
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_vertical"
 			android:layout_marginRight="@dimen/favorites_icon_right_margin"
-			android:src="@drawable/ic_sdcard"
+			osmand:srcCompat="@drawable/ic_sdcard"
 			android:layout_marginEnd="@dimen/favorites_icon_right_margin" />
 
 		<LinearLayout
@@ -80,7 +81,7 @@
 			android:layout_gravity="center_vertical"
 			android:background="?attr/dashboard_button"
 			android:focusable="false"
-			android:src="@drawable/ic_overflow_menu_white"/>
+			osmand:srcCompat="@drawable/ic_overflow_menu_white"/>
 
 		<ImageButton
 			android:id="@+id/play"
@@ -90,7 +91,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" />
 		</LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -33,7 +34,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/content_padding"
             android:layout_marginRight="@dimen/content_padding"
-            android:src="@drawable/ic_type_audio"
+            osmand:srcCompat="@drawable/ic_type_audio"
 	        android:layout_marginStart="@dimen/content_padding"
 	        android:layout_marginEnd="@dimen/content_padding" />
 
@@ -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"/>
 
     </LinearLayout>
 
@@ -94,4 +95,4 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,7 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/content_padding"
-            android:src="@drawable/ic_action_time"/>
+            osmand:srcCompat="@drawable/ic_action_time"/>
 
         <LinearLayout
             android:layout_width="0dp"
@@ -57,7 +58,7 @@
             android:layout_width="@dimen/bottom_sheet_list_item_height"
             android:layout_height="@dimen/bottom_sheet_list_item_height"
             android:layout_gravity="top"
-            android:src="@drawable/ic_action_remove_dark"/>
+            osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
     </LinearLayout>
     <Button
diff --git a/OsmAnd/res/layout/order_poi_list_item.xml b/OsmAnd/res/layout/order_poi_list_item.xml
index e208a1c05f..2b9fc09e03 100644
--- a/OsmAnd/res/layout/order_poi_list_item.xml
+++ b/OsmAnd/res/layout/order_poi_list_item.xml
@@ -65,7 +65,7 @@
 			android:layout_gravity="center"
 			android:paddingLeft="@dimen/content_padding"
 			android:paddingRight="@dimen/content_padding"
-			android:src="@drawable/ic_action_item_move"
+			osmand:srcCompat="@drawable/ic_action_item_move"
 			android:tint="?attr/secondary_icon_color"
 			android:paddingStart="@dimen/content_padding"
 			android:paddingEnd="@dimen/content_padding" />
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
@@ -29,9 +30,9 @@
         android:layout_marginRight="@dimen/dialog_elements_vertical_margin"
         android:gravity="center_vertical"
         android:maxLines="2"
-        android:src="@drawable/ic_action_remove_dark"
+        osmand:srcCompat="@drawable/ic_action_remove_dark"
         android:textSize="@dimen/default_desc_text_size"
 	    android:layout_marginEnd="@dimen/dialog_elements_vertical_margin"
 	    android:layout_marginStart="3dp" />
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:descendantFocusability="blocksDescendants"
@@ -24,7 +25,7 @@
             android:layout_marginRight="@dimen/favorites_icon_right_margin"
             android:paddingTop="6dp"
             android:tint="@color/map_widget_blue"
-            android:src="@drawable/ic_action_osm_live"
+            osmand:srcCompat="@drawable/ic_action_osm_live"
 	        android:layout_marginEnd="@dimen/favorites_icon_right_margin" />
 
         <LinearLayout
diff --git a/OsmAnd/res/layout/osmlive_cancelled_dialog_fragment.xml b/OsmAnd/res/layout/osmlive_cancelled_dialog_fragment.xml
index 1654c4aec6..e65aa1ce39 100644
--- a/OsmAnd/res/layout/osmlive_cancelled_dialog_fragment.xml
+++ b/OsmAnd/res/layout/osmlive_cancelled_dialog_fragment.xml
@@ -30,7 +30,7 @@
                     android:layout_width="@dimen/standard_icon_size"
                     android:layout_height="@dimen/standard_icon_size"
                     android:background="?attr/circle_dialog_bg"
-                    android:src="@drawable/ic_action_remove_small"
+                    osmand:srcCompat="@drawable/ic_action_remove_small"
                     android:tint="@color/icon_color_default_light"/>
 
             </FrameLayout>
@@ -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"/>
 
         </FrameLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -53,6 +54,6 @@
 		android:id="@+id/dropDownIcon"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
-		android:src="@drawable/ic_action_arrow_drop_down" />
+		osmand:srcCompat="@drawable/ic_action_arrow_drop_down" />
 
 </LinearLayout>
\ 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" />
 
 					<LinearLayout
 						android:layout_width="0dp"
@@ -197,7 +197,7 @@
 								android:layout_marginTop="@dimen/route_info_icon_vertical_padding"
 								android:layout_marginRight="@dimen/route_info_icon_vertical_padding"
 								android:layout_marginBottom="@dimen/route_info_icon_vertical_padding"
-								tools:src="@drawable/ic_action_test_light"
+								tools:src="@drawable/ic_action_remove_dark"
 								android:layout_marginEnd="@dimen/route_info_icon_vertical_padding"
 								android:layout_marginStart="@dimen/route_info_icon_vertical_padding" />
 
@@ -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" />
 
 					<LinearLayout
 						android:layout_width="0dp"
@@ -356,7 +356,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" />
 
 					<LinearLayout
 						android:layout_width="0dp"
@@ -577,7 +577,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" />
 
 	</LinearLayout>
 
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">
 
-        <ImageView
-            android:id="@+id/plugin_image"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:adjustViewBounds="true"
-            android:maxHeight="200dp"
-            android:maxWidth="360dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/extension_stub"/>
+		<FrameLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<ImageView
+				android:id="@+id/plugin_image_placeholder"
+				android:layout_width="360dp"
+				android:layout_height="144dp"
+				android:layout_gravity="center"
+				android:scaleType="center"
+				android:background="@color/osmand_orange"
+				osmand:srcCompat="@drawable/ic_extension_dark"
+				android:visibility="gone"/>
+
+			<ImageView
+				android:id="@+id/plugin_image"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:adjustViewBounds="true"
+				android:maxWidth="360dp"
+				android:maxHeight="200dp"
+				android:scaleType="fitCenter" />
+
+		</FrameLayout>
 
         <FrameLayout
             android:id="@+id/plugin_header"
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 2fa4d3e50f..c616b0014f 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -65,6 +65,6 @@
         android:layout_height="@dimen/list_item_height"
         android:layout_gravity="center"
         android:background="?attr/dashboard_button"
-        android:src="@drawable/ic_overflow_menu_white"/>
+        osmand:srcCompat="@drawable/ic_overflow_menu_white"/>
 
 </LinearLayout>
\ 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"/>
 
         </LinearLayout>
 
@@ -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"/>
 
     </LinearLayout>
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"/>
 
                             </LinearLayout>
 
@@ -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"/>
 
                             </LinearLayout>
 
@@ -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"/>
 
                             </LinearLayout>
 
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" />
 
 				</FrameLayout>
 
@@ -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" />
 
 						</LinearLayout>
@@ -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" />
 
 					<TextView
 						android:id="@+id/delete_action_title"
diff --git a/OsmAnd/res/layout/point_editor_group_select_item.xml b/OsmAnd/res/layout/point_editor_group_select_item.xml
index c0df94d0ca..97da470972 100644
--- a/OsmAnd/res/layout/point_editor_group_select_item.xml
+++ b/OsmAnd/res/layout/point_editor_group_select_item.xml
@@ -26,7 +26,7 @@
 			android:layout_marginStart="@dimen/context_menu_padding_margin_tiny"
 			android:layout_marginEnd="@dimen/context_menu_padding_margin_tiny"
 			android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
-			android:src="@drawable/ic_action_folder" />
+			app:srcCompat="@drawable/ic_action_folder" />
 
 		<TextView
 			android:id="@+id/counter"
diff --git a/OsmAnd/res/layout/popup_list_item_icon24_and_menu.xml b/OsmAnd/res/layout/popup_list_item_icon24_and_menu.xml
index 998ad4e0d4..744463e03c 100644
--- a/OsmAnd/res/layout/popup_list_item_icon24_and_menu.xml
+++ b/OsmAnd/res/layout/popup_list_item_icon24_and_menu.xml
@@ -16,7 +16,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="24dp"
         android:layout_marginStart="24dp"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        tools:src="@drawable/ic_action_info_dark"/>
 
     <LinearLayout
         android:id="@+id/text_wrapper"
@@ -69,7 +69,7 @@
         android:layout_margin="16dp"
         android:layout_toLeftOf="@+id/toggle_item"
         android:layout_toStartOf="@+id/toggle_item"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        tools:src="@drawable/ic_action_info_dark"/>
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/toggle_item"
diff --git a/OsmAnd/res/layout/preference_activity.xml b/OsmAnd/res/layout/preference_activity.xml
index fd222526c0..829af19eda 100644
--- a/OsmAnd/res/layout/preference_activity.xml
+++ b/OsmAnd/res/layout/preference_activity.xml
@@ -99,7 +99,7 @@
 				android:layout_height="wrap_content"
 				android:layout_weight="0"
 				android:layout_gravity="center_vertical"
-				android:src="@drawable/ic_action_arrow_drop_down"/>
+				app:srcCompat="@drawable/ic_action_arrow_drop_down"/>
 
 		</LinearLayout>
 
@@ -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" />
 
 	</FrameLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/prev_route_card"
 	android:layout_width="match_parent"
@@ -15,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" />
 
 	</LinearLayout>
 
@@ -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" />
 
 			<LinearLayout
@@ -118,7 +119,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" />
 
 	</LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -34,7 +35,7 @@
 				android:layout_marginEnd="@dimen/list_content_padding_large"
 				android:layout_marginRight="@dimen/list_content_padding_large"
 				android:layout_marginBottom="@dimen/content_padding"
-				android:src="@drawable/ic_action_arrow_down" />
+				osmand:srcCompat="@drawable/ic_action_arrow_down" />
 
 			<LinearLayout
 				android:layout_width="0dp"
diff --git a/OsmAnd/res/layout/profile_edit_list_item.xml b/OsmAnd/res/layout/profile_edit_list_item.xml
index cb0cc1aa89..4ba371355d 100644
--- a/OsmAnd/res/layout/profile_edit_list_item.xml
+++ b/OsmAnd/res/layout/profile_edit_list_item.xml
@@ -85,19 +85,23 @@
 
 		</LinearLayout>
 
-		<ImageView
-			android:id="@+id/move_icon"
-			android:layout_width="wrap_content"
+		<FrameLayout
+			android:id="@+id/move_button"
 			android:layout_height="wrap_content"
+			android:layout_width="wrap_content"
 			android:layout_gravity="center"
-			android:paddingLeft="@dimen/content_padding"
-			android:paddingTop="@dimen/bottom_sheet_icon_margin"
-			android:paddingRight="@dimen/content_padding"
-			android:paddingBottom="@dimen/bottom_sheet_icon_margin"
-			android:src="@drawable/ic_action_item_move"
-			android:tint="?attr/secondary_icon_color"
-			android:paddingEnd="@dimen/content_padding"
-			android:paddingStart="@dimen/content_padding" />
+			android:layout_marginEnd="@dimen/content_padding_half"
+			android:layout_marginRight="@dimen/content_padding_half"
+			android:padding="@dimen/content_padding_small">
+
+			<ImageView
+				android:id="@+id/move_icon"
+				android:layout_width="@dimen/standard_icon_size"
+				android:layout_height="@dimen/standard_icon_size"
+				osmand:srcCompat="@drawable/ic_action_item_move"
+				android:tint="?attr/secondary_icon_color" />
+
+		</FrameLayout>
 
 	</LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/profile_settings"
 	android:layout_width="match_parent"
@@ -78,7 +79,7 @@
 					android:paddingLeft="@dimen/setting_profile_item_switch_margin"
 					android:paddingEnd="10dp"
 					android:paddingRight="10dp"
-					android:src="@drawable/ic_action_additional_option"
+					osmand:srcCompat="@drawable/ic_action_additional_option"
 					android:tint="@color/description_font_and_bottom_sheet_icons" />
 
 				<androidx.appcompat.widget.SwitchCompat
diff --git a/OsmAnd/res/layout/profile_preference_toolbar.xml b/OsmAnd/res/layout/profile_preference_toolbar.xml
index e275f43fdf..d2260f21ea 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar.xml
@@ -29,7 +29,7 @@
 			android:layout_marginEnd="@dimen/content_padding"
 			android:contentDescription="@string/access_shared_string_navigate_up"
 			android:scaleType="fitCenter"
-			android:src="@drawable/ic_arrow_back"
+			osmand:srcCompat="@drawable/ic_arrow_back"
 			android:tint="?attr/default_icon_color" />
 
 		<LinearLayout
diff --git a/OsmAnd/res/layout/profile_preference_toolbar_big.xml b/OsmAnd/res/layout/profile_preference_toolbar_big.xml
index 9625fb9ec5..bae4062460 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar_big.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_big.xml
@@ -29,7 +29,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/default_icon_color" />
 
 			<net.osmand.plus.widgets.TextViewEx
@@ -123,7 +123,7 @@
 				android:layout_gravity="center_vertical"
 				android:layout_marginLeft="@dimen/bottom_sheet_image_text_margin_start"
 				android:layout_marginRight="@dimen/bottom_sheet_image_text_margin_start"
-				android:src="@drawable/ic_action_arrow_down"
+				osmand:srcCompat="@drawable/ic_action_arrow_down"
 				android:tint="?attr/default_icon_color"
 				android:layout_marginStart="@dimen/bottom_sheet_image_text_margin_start"
 				android:layout_marginEnd="@dimen/bottom_sheet_image_text_margin_start" />
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"/>
 
         <LinearLayout
diff --git a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
index f41dbd71ca..502dfde3ca 100644
--- a/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
+++ b/OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
@@ -35,7 +35,7 @@
 				android:layout_marginEnd="@dimen/content_padding"
 				android:contentDescription="@string/access_shared_string_navigate_up"
 				android:scaleType="fitCenter"
-				android:src="@drawable/ic_arrow_back"
+				osmand:srcCompat="@drawable/ic_arrow_back"
 				android:tint="?attr/default_icon_color" />
 
 			<LinearLayout
diff --git a/OsmAnd/res/layout/purchase_dialog_card_button_active_ex.xml b/OsmAnd/res/layout/purchase_dialog_card_button_active_ex.xml
index c2966dec32..91d65a9000 100644
--- a/OsmAnd/res/layout/purchase_dialog_card_button_active_ex.xml
+++ b/OsmAnd/res/layout/purchase_dialog_card_button_active_ex.xml
@@ -74,7 +74,7 @@
 				android:layout_gravity="center"
 				android:layout_marginStart="@dimen/list_header_padding"
 				android:layout_marginLeft="@dimen/list_header_padding"
-				android:src="@drawable/img_feature_purchased" />
+				osmand:srcCompat="@drawable/img_feature_purchased" />
 
 		</LinearLayout>
 
@@ -153,4 +153,4 @@
 		android:background="?attr/wikivoyage_card_divider_color"
 		android:visibility="gone" />
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -13,7 +14,7 @@
         android:layout_width="@dimen/card_title_row_min_height"
         android:layout_height="match_parent"
         android:scaleType="center"
-        android:src="@drawable/img_logo_38dp_osmand"/>
+        osmand:srcCompat="@drawable/img_logo_38dp_osmand"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/purchase_dialog_card_row.xml b/OsmAnd/res/layout/purchase_dialog_card_row.xml
index 29edc16bfe..20ad2263f1 100644
--- a/OsmAnd/res/layout/purchase_dialog_card_row.xml
+++ b/OsmAnd/res/layout/purchase_dialog_card_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_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" />
 
                 <net.osmand.plus.widgets.TextViewEx
@@ -68,6 +68,8 @@
                         android:layout_height="wrap_content"
                         android:textColor="?attr/dialog_description_color"
                         android:textSize="@dimen/default_list_text_size"
+                        android:letterSpacing="@dimen/text_button_letter_spacing"
+                        android:lineSpacingMultiplier="@dimen/info_description_line_spacing_multiplier"
                         osmand:typeface="@string/font_roboto_regular"
                         tools:text="@string/purchase_dialog_travel_description" />
 
@@ -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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
@@ -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" />
 
     <ImageView
         android:layout_width="match_parent"
@@ -47,7 +48,7 @@
         android:layout_gravity="top"
         android:scaleType="fitXY"
         android:layout_marginTop="16dp"
-        android:src="@drawable/bg_shadow_list_top" />
+        osmand:srcCompat="@drawable/bg_shadow_list_top" />
 
     <LinearLayout
         android:id="@+id/title_view"
@@ -118,6 +119,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" />
 
 </LinearLayout>
\ 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 901a43ab45..827dde199a 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/searchListItemLayout"
     android:layout_width="match_parent"
@@ -22,7 +23,7 @@
         android:layout_marginRight="16dp"
         android:scaleType="centerInside"
         android:tint="?attr/default_icon_color"
-        android:src="@drawable/ic_action_flag_dark"
+        osmand:srcCompat="@drawable/ic_action_flag_dark"
 	    android:layout_marginEnd="16dp" />
 
     <TextView
@@ -34,4 +35,4 @@
         android:textSize="@dimen/default_list_text_size"
         tools:text="Add marker" />
 
-</LinearLayout>
+</LinearLayout>
\ 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 61376fa2d6..fe9b8ed007 100644
--- a/OsmAnd/res/layout/quick_action_add_favorite.xml
+++ b/OsmAnd/res/layout/quick_action_add_favorite.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -40,7 +41,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" />
 
     <ImageView
         android:layout_width="match_parent"
@@ -48,7 +49,7 @@
         android:scaleType="fitXY"
         android:layout_gravity="top"
         android:layout_marginTop="@dimen/content_padding"
-        android:src="@drawable/bg_shadow_list_top"/>
+        osmand:srcCompat="@drawable/bg_shadow_list_top"/>
 
     <LinearLayout
         android:id="@+id/title_view"
@@ -78,7 +79,7 @@
                     android:layout_marginTop="2dp"
                     android:scaleType="centerInside"
                     android:tint="?attr/default_icon_color"
-                    android:src="@drawable/ic_action_fav_dark"/>
+                    osmand:srcCompat="@drawable/ic_action_fav_dark"/>
 
             </LinearLayout>
 
@@ -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"/>
 
             </LinearLayout>
 
@@ -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" />
 
 </LinearLayout>
\ 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 08183aa5fd..afb59f3475 100644
--- a/OsmAnd/res/layout/quick_action_add_gpx.xml
+++ b/OsmAnd/res/layout/quick_action_add_gpx.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -40,7 +41,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" />
 
     <ImageView
         android:layout_width="match_parent"
@@ -48,7 +49,7 @@
         android:scaleType="fitXY"
         android:layout_gravity="top"
         android:layout_marginTop="@dimen/content_padding"
-        android:src="@drawable/bg_shadow_list_top"/>
+        osmand:srcCompat="@drawable/bg_shadow_list_top"/>
 
     <LinearLayout
         android:id="@+id/title_view"
@@ -78,7 +79,7 @@
                     android:layout_marginTop="2dp"
                     android:scaleType="centerInside"
                     android:tint="?attr/default_icon_color"
-                    android:src="@drawable/ic_action_fav_dark"/>
+                    osmand:srcCompat="@drawable/ic_action_fav_dark"/>
 
             </LinearLayout>
 
@@ -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"/>
 
             </LinearLayout>
 
@@ -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" />
 
 </LinearLayout>
\ 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"/>
 
         <ImageView
             android:layout_width="match_parent"
@@ -56,7 +56,7 @@
             android:layout_gravity="top"
             android:layout_marginTop="@dimen/content_padding"
             android:scaleType="fitXY"
-            android:src="@drawable/bg_shadow_list_top"/>
+            osmand:srcCompat="@drawable/bg_shadow_list_top"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -74,7 +74,7 @@
                 <!--android:layout_height="48dp"-->
                 <!--android:layout_gravity="bottom"-->
                 <!--android:background="@null"-->
-                <!--android:src="@drawable/ic_action_label"/>-->
+                <!--osmand:srcCompat="@drawable/ic_action_label"/>-->
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/poiTypeTextInputLayout"
@@ -108,7 +108,7 @@
                 android:layout_height="48dp"
                 android:layout_gravity="bottom"
                 android:background="@null"
-                android:src="@drawable/ic_action_help"/>
+                osmand:srcCompat="@drawable/ic_action_help"/>
         </LinearLayout>
 
         <!--<ImageView-->
@@ -116,7 +116,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"/>-->
 
         <!--<ImageView-->
             <!--android:layout_width="match_parent"-->
@@ -124,7 +124,7 @@
             <!--android:layout_gravity="top"-->
             <!--android:layout_marginTop="16dp"-->
             <!--android:scaleType="fitXY"-->
-            <!--android:src="@drawable/bg_shadow_list_top"/>-->
+            <!--osmand:srcCompat="@drawable/bg_shadow_list_top"/>-->
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -177,7 +177,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" />
 
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
\ 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 67cf8cf498..669473e538 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 @@
             <!--android:scaleType="centerInside"-->
             <!--android:tint="@color/color_white"-->
             <!--android:background="?attr/selectableItemBackground"-->
-            <!--android:src="@drawable/ic_action_flag_dark" />-->
+            <!--app:srcCompat="@drawable/ic_action_flag_dark" />-->
         <!---->
     <!--</LinearLayout>-->
 
@@ -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_dark"
+            app:srcCompat="@drawable/ic_action_flag_dark"
 	        android:layout_marginStart="16dp" />
 
         <androidx.appcompat.widget.AppCompatEditText
@@ -112,7 +112,7 @@
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
             android:layout_gravity="top"
-            android:src="@drawable/bg_shadow_list_bottom"/>
+            app:srcCompat="@drawable/bg_shadow_list_bottom"/>
 
         <ImageView
             android:layout_width="match_parent"
@@ -120,7 +120,7 @@
             android:scaleType="fitXY"
             android:layout_gravity="bottom"
             android:layout_marginBottom="56dp"
-            android:src="@drawable/bg_shadow_list_top"/>
+            app:srcCompat="@drawable/bg_shadow_list_top"/>
 
         <Button
             android:id="@+id/btnApply"
diff --git a/OsmAnd/res/layout/quick_action_deletable_list_item.xml b/OsmAnd/res/layout/quick_action_deletable_list_item.xml
index 2fb4b2c2f5..59c19ef849 100644
--- a/OsmAnd/res/layout/quick_action_deletable_list_item.xml
+++ b/OsmAnd/res/layout/quick_action_deletable_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -24,7 +25,7 @@
             android:focusable="false"
             android:tint="?attr/secondary_icon_color"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_action_reorder"
+            osmand:srcCompat="@drawable/ic_action_item_move"
 	        android:layout_marginEnd="4dp" />
 
         <TextView
@@ -48,7 +49,7 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="centerInside"
             android:tint="?attr/secondary_icon_color"
-            android:src="@drawable/ic_action_remove_dark"/>
+            osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
     </LinearLayout>
 
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"/>
 
         <View
             android:id="@+id/bottomMarginView"
@@ -69,7 +69,7 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
         android:layout_margin="16dp"
-        android:src="@drawable/ic_action_plus"
+        app:srcCompat="@drawable/ic_action_plus"
         android:contentDescription="@string/quick_action_new_action"
         app:backgroundTint="?attr/color_dialog_buttons"
 	    android:layout_alignParentEnd="true" />
diff --git a/OsmAnd/res/layout/quick_action_list_item.xml b/OsmAnd/res/layout/quick_action_list_item.xml
index b1179c56ce..5ec570ca25 100644
--- a/OsmAnd/res/layout/quick_action_list_item.xml
+++ b/OsmAnd/res/layout/quick_action_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -24,7 +25,7 @@
             android:focusable="false"
             android:scaleType="centerInside"
             android:tint="?attr/secondary_icon_color"
-            android:src="@drawable/ic_action_reorder"
+            osmand:srcCompat="@drawable/ic_action_item_move"
 	        android:layout_marginEnd="4dp" />
 
         <androidx.appcompat.widget.AppCompatImageView
@@ -35,7 +36,7 @@
             android:layout_marginRight="8dp"
             android:scaleType="centerInside"
             android:tint="?attr/default_icon_color"
-            android:src="@drawable/ic_action_flag_dark"
+            osmand:srcCompat="@drawable/ic_action_flag_dark"
 	        android:layout_marginEnd="8dp" />
 
         <LinearLayout
@@ -78,7 +79,7 @@
             android:scaleType="centerInside"
             android:tint="?attr/secondary_icon_color"
             android:contentDescription="@string/action_delete"
-            android:src="@drawable/ic_action_remove_dark"/>
+            osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
     </LinearLayout>
 
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" />
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">
@@ -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"/>
 
     <ImageView
         android:layout_width="match_parent"
@@ -27,7 +28,7 @@
         android:layout_gravity="top"
         android:layout_marginTop="@dimen/content_padding"
         android:scaleType="fitXY"
-        android:src="@drawable/bg_shadow_list_top"/>
+        osmand:srcCompat="@drawable/bg_shadow_list_top"/>
 
     <LinearLayout
         android:id="@+id/show_dialog_row"
@@ -62,6 +63,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"/>
 
 </LinearLayout>
\ 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 b55a361706..9e387eb049 100644
--- a/OsmAnd/res/layout/quick_action_switchable_action.xml
+++ b/OsmAnd/res/layout/quick_action_switchable_action.xml
@@ -49,7 +49,7 @@
         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" />
 
     <ImageView
         android:layout_width="match_parent"
@@ -57,7 +57,7 @@
         android:layout_gravity="top"
         android:layout_marginTop="@dimen/content_padding"
         android:scaleType="fitXY"
-        android:src="@drawable/bg_shadow_list_top" />
+        app:srcCompat="@drawable/bg_shadow_list_top" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -121,6 +121,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" />
 
 </LinearLayout>
\ 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 30f45799db..d78a0dc45d 100644
--- a/OsmAnd/res/layout/quick_action_switchable_item.xml
+++ b/OsmAnd/res/layout/quick_action_switchable_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -23,7 +24,7 @@
             android:layout_marginRight="4dp"
             android:focusable="false"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_action_reorder"
+            osmand:srcCompat="@drawable/ic_action_item_move"
             android:tint="?attr/secondary_icon_color"
 	        android:layout_marginEnd="4dp" />
 
@@ -35,7 +36,7 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_map"
+            osmand:srcCompat="@drawable/ic_map"
 	        android:layout_marginStart="16dp"
 	        android:layout_marginEnd="16dp" />
 
@@ -58,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 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -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" />
 </LinearLayout>
\ 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" />
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/recording_note_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -57,7 +58,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@drawable/circle_outline_background_style"
                     android:scaleType="center"
-                    android:src="@drawable/ic_action_refresh_dark"/>
+                    osmand:srcCompat="@drawable/ic_action_refresh_dark"/>
 
                 <TextView
                     android:id="@+id/leftButtonText"
@@ -100,7 +101,7 @@
                         android:layout_height="match_parent"
                         android:background="@drawable/orange_circle_background_style"
                         android:scaleType="center"
-                        android:src="@drawable/ic_action_done"/>
+                        osmand:srcCompat="@drawable/ic_action_done"/>
 
                     <ProgressBar
                         android:id="@+id/progressBar"
@@ -150,7 +151,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@drawable/circle_outline_background_style"
                     android:scaleType="center"
-                    android:src="@drawable/ic_action_device_camera"/>
+                    osmand:srcCompat="@drawable/ic_action_device_camera"/>
 
                 <TextView
                     android:id="@+id/rightButtonText"
diff --git a/OsmAnd/res/layout/route_info_header.xml b/OsmAnd/res/layout/route_info_header.xml
index f8777ec7b0..6b88e6bced 100644
--- a/OsmAnd/res/layout/route_info_header.xml
+++ b/OsmAnd/res/layout/route_info_header.xml
@@ -28,7 +28,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:src="@drawable/ic_action_route_distance" />
+				osmand:srcCompat="@drawable/ic_action_route_distance" />
 
 			<LinearLayout
 				android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:src="@drawable/ic_action_time_span" />
+				osmand:srcCompat="@drawable/ic_action_time_span" />
 
 			<LinearLayout
 				android:layout_width="wrap_content"
@@ -209,7 +209,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:src="@drawable/ic_action_altitude_average" />
+				osmand:srcCompat="@drawable/ic_action_altitude_average" />
 
 			<LinearLayout
 				android:layout_width="wrap_content"
@@ -254,7 +254,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:src="@drawable/ic_action_altitude_average" />
+				osmand:srcCompat="@drawable/ic_action_altitude_average" />
 
 			<LinearLayout
 				android:layout_width="wrap_content"
@@ -355,7 +355,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:src="@drawable/ic_action_altitude_ascent" />
+				osmand:srcCompat="@drawable/ic_action_altitude_ascent" />
 
 			<LinearLayout
 				android:layout_width="wrap_content"
@@ -400,7 +400,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center"
-				android:src="@drawable/ic_action_altitude_descent" />
+				osmand:srcCompat="@drawable/ic_action_altitude_descent" />
 
 			<LinearLayout
 				android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/route_info_statistic.xml b/OsmAnd/res/layout/route_info_statistic.xml
index e2957239ae..6d373ecbd9 100644
--- a/OsmAnd/res/layout/route_info_statistic.xml
+++ b/OsmAnd/res/layout/route_info_statistic.xml
@@ -52,7 +52,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_info_dark"
+						osmand:srcCompat="@drawable/ic_action_info_dark"
 						android:layout_marginEnd="@dimen/list_content_padding"
 						android:layout_marginStart="@dimen/list_content_padding" />
 
@@ -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" />
 
 			<LinearLayout
diff --git a/OsmAnd/res/layout/route_waypoint_item.xml b/OsmAnd/res/layout/route_waypoint_item.xml
index 0c51950ce4..96b35262c6 100644
--- a/OsmAnd/res/layout/route_waypoint_item.xml
+++ b/OsmAnd/res/layout/route_waypoint_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/package_delivered_layout"
 	android:layout_width="match_parent"
@@ -42,7 +43,7 @@
 			android:paddingStart="@dimen/content_padding"
 			android:paddingTop="12dp"
 			android:scaleType="center"
-			android:src="@drawable/ic_action_item_move"
+			osmand:srcCompat="@drawable/ic_action_item_move"
 			android:visibility="visible" />
 
 		<ImageView
@@ -50,7 +51,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_vertical"
-			android:src="@drawable/ic_action_fav_dark" />
+			osmand:srcCompat="@drawable/ic_action_fav_dark" />
 
 		<LinearLayout
 			android:layout_width="0dp"
@@ -129,8 +130,8 @@
 			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" />
 
 	</LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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" />
 
 				<net.osmand.plus.widgets.TextViewEx
diff --git a/OsmAnd/res/layout/search_advanced_coords.xml b/OsmAnd/res/layout/search_advanced_coords.xml
index e28b1755cd..12c9e4d042 100644
--- a/OsmAnd/res/layout/search_advanced_coords.xml
+++ b/OsmAnd/res/layout/search_advanced_coords.xml
@@ -88,7 +88,7 @@
                         android:id="@+id/latitudeImage"
                         android:layout_width="54dp"
                         android:layout_height="wrap_content"
-                        android:src="@drawable/ic_action_coordinates_latitude"/>
+                        app:srcCompat="@drawable/ic_action_coordinates_latitude"/>
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -118,7 +118,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" />
 
                     </FrameLayout>
@@ -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"/>
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -166,7 +166,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" />
 
                     </FrameLayout>
@@ -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"/>
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -216,7 +216,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" />
 
                     </FrameLayout>
@@ -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"/>
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -266,7 +266,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" />
 
                     </FrameLayout>
@@ -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" />
 
                     </FrameLayout>
@@ -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" />
 
                     </FrameLayout>
@@ -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" />
 
                     </FrameLayout>
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" />
 
         <net.osmand.plus.widgets.TextViewEx
diff --git a/OsmAnd/res/layout/search_custom_poi.xml b/OsmAnd/res/layout/search_custom_poi.xml
index 90082d197d..b9e427ab7c 100644
--- a/OsmAnd/res/layout/search_custom_poi.xml
+++ b/OsmAnd/res/layout/search_custom_poi.xml
@@ -126,7 +126,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"/>
 
     </FrameLayout>
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"/>
 
                     <ImageButton
                         android:id="@+id/deleteButton"
@@ -80,7 +80,7 @@
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:contentDescription="@string/shared_string_delete"
-                        android:src="@drawable/ic_action_delete_dark"/>
+                        app:srcCompat="@drawable/ic_action_delete_dark"/>
 
                 </LinearLayout>
 
@@ -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"/>
 
                     <TextView
                         android:id="@+id/buttonToolbarTitle"
@@ -159,7 +159,7 @@
                         android:layout_width="48dp"
                         android:layout_height="match_parent"
                         android:contentDescription="@string/poi_filter_custom_filter"
-                        android:src="@drawable/ic_action_filter"
+                        app:srcCompat="@drawable/ic_action_filter"
                         android:visibility="gone"/>
 
                 </LinearLayout>
@@ -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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -31,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/favorites_icon_right_margin"
             android:layout_marginTop="@dimen/favorites_icon_top_margin"
-            android:src="@drawable/ic_sdcard"
+            osmand:srcCompat="@drawable/ic_sdcard"
 	        android:layout_marginEnd="@dimen/favorites_icon_right_margin" />
 
         <LinearLayout
@@ -78,7 +79,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="4dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_small_group"
+                    osmand:srcCompat="@drawable/ic_action_group_name_16"
 	                android:layout_marginStart="4dp" />
 
                 <TextView
@@ -101,7 +102,7 @@
             android:layout_gravity="center_vertical"
             android:background="?attr/dashboard_button"
             android:focusable="false"
-            android:src="@drawable/ic_overflow_menu_white"
+            osmand:srcCompat="@drawable/ic_overflow_menu_white"
             android:visibility="gone" />
 
         <ImageButton
@@ -112,7 +113,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/dashFavIconMargin"
             android:background="?attr/dashboard_button"
-            android:src="@drawable/ic_action_test_light"
+            osmand:srcCompat="@drawable/ic_action_remove_dark"
             android:visibility="gone"
 	        android:layout_marginStart="@dimen/dashFavIconMargin" />
     </LinearLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -111,7 +112,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="4dp"
                         android:layout_marginTop="4.5dp"
-                        android:src="@drawable/ic_small_group"
+                        osmand:srcCompat="@drawable/ic_action_group_name_16"
 	                    android:layout_marginEnd="4dp" />
 
                     <TextView
@@ -137,7 +138,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
                         android:layout_marginRight="@dimen/gpx_small_icon_margin"
-                        android:src="@drawable/ic_small_time"
+                        osmand:srcCompat="@drawable/ic_action_time_16"
 	                    android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
 
                     <TextView
diff --git a/OsmAnd/res/layout/search_more_list_item.xml b/OsmAnd/res/layout/search_more_list_item.xml
index da6025e794..4bbccf294d 100644
--- a/OsmAnd/res/layout/search_more_list_item.xml
+++ b/OsmAnd/res/layout/search_more_list_item.xml
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:src="@drawable/ic_empty_state_search"
+                osmand:srcCompat="@drawable/ic_empty_state_search"
                 android:tint="#ec572e"/>
 
             <LinearLayout
@@ -126,7 +126,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp"
-                android:src="@drawable/ic_world_globe_dark"
+                osmand:srcCompat="@drawable/ic_world_globe_dark"
                 android:tint="?attr/color_dialog_buttons"/>
 
             <net.osmand.plus.widgets.TextViewEx
@@ -141,4 +141,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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"/>
 
             </LinearLayout>
 
@@ -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"/>
 
     </FrameLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="56dp"
               android:focusableInTouchMode="true"
@@ -36,6 +37,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:contentDescription="@string/shared_string_close"
-        android:src="@drawable/ic_action_remove_dark"/>
+        osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
 </LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -21,7 +22,7 @@
             android:layout_height="@dimen/standard_icon_size"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="8dp"
-            android:src="@android:drawable/ic_search_category_default"
+            osmand:srcCompat="@android:drawable/ic_search_category_default"
 	        android:layout_marginEnd="8dp" />
 
         <!-- to not gain focus everytime  -->
@@ -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" />
     </LinearLayout>
 
     <ListView
diff --git a/OsmAnd/res/layout/searchpoi_list.xml b/OsmAnd/res/layout/searchpoi_list.xml
index 5030bca152..2fcf5f5638 100644
--- a/OsmAnd/res/layout/searchpoi_list.xml
+++ b/OsmAnd/res/layout/searchpoi_list.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -53,7 +54,7 @@
                 android:layout_height="@dimen/directionIconSize"
                 android:layout_marginTop="1sp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_direction_arrow"
+                osmand:srcCompat="@drawable/ic_direction_arrow"
                 tools:visiblity="visible" />
 
             <TextView
@@ -73,7 +74,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="@dimen/gpx_small_icon_margin"
-                android:src="@drawable/ic_small_time"
+                osmand:srcCompat="@drawable/ic_action_time_16"
 	            android:layout_marginEnd="@dimen/gpx_small_icon_margin" />
 
             <TextView
diff --git a/OsmAnd/res/layout/searchpoifolder_list.xml b/OsmAnd/res/layout/searchpoifolder_list.xml
index e2dbe9161a..c5f309ce5b 100644
--- a/OsmAnd/res/layout/searchpoifolder_list.xml
+++ b/OsmAnd/res/layout/searchpoifolder_list.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:osmand="http://schemas.android.com/apk/res-auto"
 			  xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
@@ -40,5 +41,5 @@
         android:scaleType="center"
         android:visibility="gone"
         android:background="?attr/dashboard_button"
-        android:src="@drawable/ic_overflow_menu_white"/>
-</LinearLayout>
+        osmand:srcCompat="@drawable/ic_overflow_menu_white"/>
+</LinearLayout>
\ 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"/>
 
             </LinearLayout>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical"
@@ -33,7 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:paddingRight="@dimen/list_content_padding"
-            android:src="@drawable/ic_action_volume_up"
+            osmand:srcCompat="@drawable/ic_action_volume_up"
 	        android:paddingEnd="@dimen/list_content_padding" />
 
         <LinearLayout
@@ -64,7 +65,7 @@
                     android:id="@+id/dropDownIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:src="@drawable/ic_action_arrow_drop_down"/>
+                    osmand:srcCompat="@drawable/ic_action_arrow_drop_down"/>
 
             </LinearLayout>
 
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" />
 
                 </LinearLayout>
 
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"/>
 
         <net.osmand.plus.widgets.TextViewEx
             android:id="@+id/titleTextView"
@@ -76,7 +76,7 @@
                                 android:layout_width="56dp"
                                 android:layout_height="48dp"
                                 android:scaleType="center"
-                                android:src="@drawable/ic_action_osm_live"
+                                app:srcCompat="@drawable/ic_action_osm_live"
                                 android:tint="@color/osmand_orange"/>
 
                             <TextView
@@ -155,7 +155,7 @@
                                 android:layout_width="56dp"
                                 android:layout_height="48dp"
                                 android:scaleType="center"
-                                android:src="@drawable/ic_world_globe_dark"/>
+                                app:srcCompat="@drawable/ic_world_globe_dark"/>
 
                             <LinearLayout
                                 android:layout_width="match_parent"
@@ -213,7 +213,7 @@
                                 android:layout_width="56dp"
                                 android:layout_height="48dp"
                                 android:scaleType="center"
-                                android:src="@drawable/ic_action_message"/>
+                                app:srcCompat="@drawable/ic_action_message"/>
 
                             <EditText
                                 android:id="@+id/emailEdit"
@@ -261,7 +261,7 @@
                                     android:layout_width="56dp"
                                     android:layout_height="48dp"
                                     android:scaleType="center"
-                                    android:src="@drawable/ic_person"/>
+                                    app:srcCompat="@drawable/ic_action_user"/>
 
                                 <EditText
                                     android:id="@+id/userNameEdit"
@@ -339,4 +339,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
+</LinearLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -17,7 +18,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="@dimen/list_content_padding"
-        android:src="@drawable/ic_action_gabout_dark"
+        osmand:srcCompat="@drawable/ic_action_info_dark"
 	    android:layout_marginEnd="@dimen/list_content_padding" />
 
     <LinearLayout
diff --git a/OsmAnd/res/layout/time_from_to_layout.xml b/OsmAnd/res/layout/time_from_to_layout.xml
index 372cc05552..66e56f9f67 100644
--- a/OsmAnd/res/layout/time_from_to_layout.xml
+++ b/OsmAnd/res/layout/time_from_to_layout.xml
@@ -2,6 +2,7 @@
 
 
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
@@ -64,7 +65,7 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_gravity="top"
-        android:src="@drawable/ic_action_remove_dark"/>
+        osmand:srcCompat="@drawable/ic_action_remove_dark"/>
 
 </LinearLayout>
 
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"/>
 
     </FrameLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/plan_route_info"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -43,7 +44,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_marginEnd="@dimen/list_content_padding"
 	                    android:layout_marginStart="@dimen/list_content_padding" />
 
@@ -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" />
 
                 </LinearLayout>
@@ -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" />
 
                 </LinearLayout>
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" />
 
 </LinearLayout>
\ 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"/>
 
     <Button
diff --git a/OsmAnd/res/layout/waypoint_reached.xml b/OsmAnd/res/layout/waypoint_reached.xml
index f9519ca4be..9a7f41bed5 100644
--- a/OsmAnd/res/layout/waypoint_reached.xml
+++ b/OsmAnd/res/layout/waypoint_reached.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/package_delivered_layout"
@@ -22,7 +23,7 @@
         android:paddingLeft="12dp"
         android:paddingStart="12dp"
         android:scaleType="center"
-        android:src="@drawable/ic_flat_list_dark"
+        osmand:srcCompat="@drawable/ic_flat_list_dark"
         android:visibility="gone"
         tools:visibility="visible"/>
 
@@ -31,7 +32,7 @@
         android:layout_width="56dp"
         android:layout_height="25dp"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_action_fav_dark"/>
+        osmand:srcCompat="@drawable/ic_action_fav_dark"/>
 
     <LinearLayout
         android:layout_width="0dp"
@@ -107,7 +108,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"
         tools:visibility="visible"/>
 
@@ -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"/>
 
-</LinearLayout>
+</LinearLayout>
\ 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" />
 
 		</LinearLayout>
 
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"/>
 
             </LinearLayout>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:orientation="vertical">
@@ -17,7 +18,7 @@
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_christmas_illustration"/>
+                osmand:srcCompat="@drawable/ic_christmas_illustration"/>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index a15d65d400..cb0e5c03ec 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -1849,7 +1849,7 @@
     <string name="coords_search">بحث عن إحداثيات</string>
     <string name="advanced_coords_search">بحث متقدم عن الإحداثيات</string>
     <string name="simulate_initial_startup_descr">وضع علامة تشير إلى بدء تشغيل التطبيق الأولي، أبق جميع الإعدادات الأخرى دون تغيير.</string>
-    <string name="region_maps">خرائط التوجيه (الفكتورية) والإقليمية</string>
+    <string name="region_maps">خرائط على مستوى المنطقة</string>
     <string name="hillshade_layer_disabled">طبقة التضاريس غير مفعلة</string>
     <string name="srtm_plugin_disabled">الخطوط الكنتورية معطلة</string>
     <string name="nm">ميل بحري</string>
@@ -3001,7 +3001,7 @@
     <string name="suggested_maps_descr">هذه الخرائط مطلوبة لاستخدامها مع البرنامج المساعد.</string>
     <string name="added_profiles">إضافة أوضاع</string>
     <string name="added_profiles_descr">الأوضاع المضافة بواسطة البرنامج المساعد</string>
-    <string name="shared_string_turn_off">إطفاء</string>
+    <string name="shared_string_turn_off">إيقاف</string>
     <string name="new_plugin_added">تمت تركيب إضافة جديدة</string>
     <string name="join_segments">ربط الأجزاء</string>
     <string name="add_new_profile_q">إضافة وضع جديد \'%1$s\'؟</string>
@@ -3653,4 +3653,23 @@
     <string name="osmand_purchases_item">مشتريات أوسماند</string>
     <string name="legend_item_description">دليل رموز الخريطة</string>
     <string name="navigation_profiles_item">الملفات الشخصية للملاحة</string>
+    <string name="release_3_7">• خرائط جديدة للمنحدرات غير المتصلة بالإنترنت
+\n
+\n • التخصيص الكامل للمفضلات ونقاط الطرق GPX - الألوان المخصصة والأيقونات والأشكال
+\n
+\n • تخصيص ترتيب العناصر في قائمة السياق ، تكوين الخريطة ، درج
+\n
+\n • ويكيبيديا كطبقة منفصلة في تكوين الخريطة ، حدد اللغات المطلوبة فقط
+\n
+\n • إنشاء مرشح / خرائط POI الخاصة بك مع مرونة تامة
+\n
+\n • تمت إضافة خيارات لاستعادة إعدادات ملفات التعريف المخصصة
+\n
+\n • مسارات GPX كاملة من الممرات دعم حركة المرور وتعليمات كاملة 
+\n
+\n • إصلاح أحجام واجهة المستخدم على الأجهزة اللوحية
+\n
+\n • إصلاح الخلل مع RTL
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml
index 02e97887d7..3b0e6a519a 100644
--- a/OsmAnd/res/values-be/phrases.xml
+++ b/OsmAnd/res/values-be/phrases.xml
@@ -1569,8 +1569,8 @@
     <string name="poi_payment_yandexmoney_yes">Яндэкс.Грошы</string>
     <string name="poi_payment_yandexmoney_no">Аплата праз Яндэкс.Грошы не прымаецца</string>
     <string name="poi_description_payment">Апісанне спосабу аплаты</string>
-    <string name="poi_internet_access_fee_yes">Доступ у Інтэрнэт - спаганяецца плата</string>
-    <string name="poi_internet_access_fee_no">Доступ у Інтэрнэт - бясплатны</string>
+    <string name="poi_internet_access_fee_yes">Доступ у інтэрнэт: спаганяецца плата</string>
+    <string name="poi_internet_access_fee_no">Доступ у інтэрнэт: бясплатны</string>
     <string name="poi_events_venue">Месца правядзення мерапрыемстваў</string>
     <string name="poi_diet_vegetarian_only">Толькі вегетарыянскае харчаванне</string>
     <string name="poi_diet_vegetarian_yes">Вегетарыянскае</string>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 504fa380c9..6380e7fdb8 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -695,7 +695,7 @@
     <string name="preferred_locale">Мова інтэрфейсу</string>
     <string name="incomplete_locale">няпоўны</string>
     <string name="unit_of_length_descr">Змяніць адзінкі вымярэння адлегласці.</string>
-    <string name="unit_of_length">Адзінкі даўжыні</string>
+    <string name="unit_of_length">Адзінкі вымярэння адлегласці</string>
     <string name="si_mi_feet">Мілі/футы</string>
     <string name="si_mi_yard">Мілі/ярды</string>
     <string name="si_km_m">Кіламетры/метры</string>
@@ -764,7 +764,7 @@
     <string name="voice_is_not_available_title">Абярыце пакунак галасавых падказак</string>
     <string name="daynight_mode_day">Дзень</string>
     <string name="daynight_mode_night">Ноч</string>
-    <string name="daynight_mode_auto">Усход/Захад</string>
+    <string name="daynight_mode_auto">Усход/Заход</string>
     <string name="daynight_mode_sensor">Датчык святла</string>
     <string name="daynight_descr">Наладзьце пераключэнне паміж дзённым і начным рэжымамі.</string>
     <string name="daynight">Рэжым дзень/ноч</string>
@@ -2027,7 +2027,7 @@
     <string name="app_mode_bus">Аўтобус</string>
     <string name="app_mode_train">Цягнік</string>
     <string name="storage_directory_card">Картка памяці</string>
-    <string name="coords_format">Фармат каардынатаў</string>
+    <string name="coords_format">Фармат каардынат</string>
     <string name="coords_format_descr">Фармат для геаграфічных каардынат.</string>
     <string name="shared_string_is_open_24_7">Адчынена 24/7</string>
     <string name="map_widget_search">Шукаць</string>
@@ -2571,7 +2571,7 @@
     <string name="sort_by">Сартаваць па</string>
     <string name="marker_show_distance_descr">Абярыце, як паказваць адлегласць і напрамак да адзнак на мапе:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Парог арыентацыі мапы</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Абярыце хуткасць, на якой арыентацыя мапы пераключаецца з «Напрамку руху» на «Па компасе».</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Абярыце хуткасць, на якой арыентацыя мапы пераключаецца з \"Напрамку руху\" на \"Па компасе\".</string>
     <string name="all_markers_moved_to_history">Усе адзнакі перамешчаныя ў гісторыю</string>
     <string name="marker_moved_to_history">Адзнака мапы перамешчаная ў гісторыю</string>
     <string name="marker_moved_to_active">Адзнака мапы стала актыўнай</string>
@@ -2705,7 +2705,7 @@
     <string name="will_open_tomorrow_at">Адчыніцца заўтра а</string>
     <string name="copy_location_name">Скапіяваць назву мясціны/POI</string>
     <string name="toast_empty_name_error">Месца без назвы</string>
-    <string name="shared_string_current">Цяперашні</string>
+    <string name="shared_string_current">Быгучы</string>
     <string name="last_intermediate_dest_description">Дадае прамежкавы прыпынак</string>
     <string name="first_intermediate_dest_description">Дадае першы прыпынак</string>
     <string name="subsequent_dest_description">Перамясціць прызначэнне далей і стварыць яго</string>
@@ -3519,4 +3519,23 @@
     <string name="listed_exist">Дадзеныя %1$s ужо ёсць у OsmAnd.</string>
     <string name="replace_all_desc">Бягучыя элементы заменяцца элементамі з файла</string>
     <string name="replace_all">Замяніць усе</string>
+    <string name="extra_maps_menu_group">Дадатковыя мапы</string>
+    <string name="download_unsupported_action">Непадтрымліваемае дзеянне %1$s</string>
+    <string name="tracker_item">Трэкер OsmAnd</string>
+    <string name="mapillary_item">OsmAnd і Mapillary</string>
+    <string name="quick_action_item">Хуткае дзеянне</string>
+    <string name="radius_ruler_item">Радыусная лінейка</string>
+    <string name="measure_distance_item">Вымярэнне адлегласці</string>
+    <string name="travel_item">Падарожжа (Віківаяж і Вікіпедыя)</string>
+    <string name="map_markers_item">Адзнакі мапы</string>
+    <string name="favorites_item">Улюбёнае</string>
+    <string name="subscription_osmandlive_item">Падпіска - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Пакупкі OsmAnd</string>
+    <string name="legend_item_description">Даведка па знаках мапы</string>
+    <string name="navigation_profiles_item">Профілі навігацыі</string>
+    <string name="create_edit_poi">Стварыць/Рэдагаваць POI</string>
+    <string name="parking_positions">Месца паркоўкі</string>
+    <string name="add_edit_favorite">Дадаць / рэдагаваць улюбёнае</string>
+    <string name="reset_deafult_order">Аднавіць прадвызначаны парадак элементаў</string>
+    <string name="back_to_editing">Вярнуцца да рэдагавання</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml
index a3ee0f18be..a7f250f04f 100644
--- a/OsmAnd/res/values-cs/strings.xml
+++ b/OsmAnd/res/values-cs/strings.xml
@@ -3443,4 +3443,23 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="osmand_purchases_item">Nákupy v OsmAnd</string>
     <string name="legend_item_description">Průvodce symboly na mapě</string>
     <string name="navigation_profiles_item">Navigační profily</string>
+    <string name="release_3_7">• Nové offline mapy svahů
+\n
+\n• Plné přizpůsobení oblíbených bodů a GPX cílů – vlastní barvy, ikony a tvary
+\n
+\n• Možnost změny pořadí položek v kontextovém menu, nastavení mapy i hlavním menu
+\n
+\n• Wikipedie jako samostatná vrstva v nastavení mapy, lze vybrat pouze potřebné jazyky
+\n
+\n• Vytváření vlastních filtrů a map bodů zájmu s plnou flexibilitou
+\n
+\n• Přidána možnost obnovit nastavení vlastních profilů
+\n
+\n• Plnohodnotné GPX trasy z navigace nyní podporují jízdní pruhy a kompletní navigační pokyny
+\n
+\n• Opravena velikost uživatelského rozhraní na tabletech
+\n
+\n• Opraveny chyby pro jazyky psané zprava doleva
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-da/phrases.xml b/OsmAnd/res/values-da/phrases.xml
index 2b7cf718ba..edcb974c92 100644
--- a/OsmAnd/res/values-da/phrases.xml
+++ b/OsmAnd/res/values-da/phrases.xml
@@ -3826,4 +3826,9 @@
     <string name="poi_drinking_water_refill_network">Netværk til påfyldning af drikkevand</string>
     <string name="poi_drinking_water_refill_no">Påfyldning af drikkevand: nej</string>
     <string name="poi_drinking_water_refill_yes">Påfyldning af drikkevand: ja</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Sugning</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">under tryk</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">Grundvand</string>
+    <string name="poi_fire_hydrant_type_pipe">Rør</string>
+    <string name="poi_fire_hydrant_pressure_filter">Lufttryk</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index fbc830f42b..77e4ccfa14 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -3659,4 +3659,15 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="favorites_item">Favoritter</string>
     <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
     <string name="navigation_profiles_item">Navigationsprofiler</string>
+    <string name="tracker_item">OsmAnd Tracker</string>
+    <string name="osmand_purchases_item">OsmAnd køb</string>
+    <string name="quick_action_transport_hide">Skjul offentlig transport</string>
+    <string name="quick_action_transport_show">Vis offentlig transport</string>
+    <string name="quick_action_show_hide_transport">Vis/skjul offentlig transport</string>
+    <string name="quick_action_transport_descr">En knap til at vise eller skjule offentlig transport på kortet.</string>
+    <string name="create_edit_poi">Opret/rediger IP</string>
+    <string name="parking_positions">Parkeringsplads</string>
+    <string name="add_edit_favorite">Tilføj / rediger favorit</string>
+    <string name="reset_deafult_order">Gendan standardrækkefølge for elementer</string>
+    <string name="back_to_editing">Tilbage til redigering</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 016fa58744..31a8733a47 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1749,7 +1749,7 @@ Lon %2$s</string>
     <string name="faq_item">FAQ</string>
     <string name="faq_item_description">Häufige Fragen</string>
     <string name="map_viewing_item">Kartenansicht</string>
-    <string name="search_on_the_map_item">Suche in der Karte</string>
+    <string name="search_on_the_map_item">Suche auf der Karte</string>
     <string name="instalation_troubleshooting_item">Installation und Problembehebung</string>
     <string name="techical_articles_item">Technische Themen</string>
     <string name="versions_item">Versionen</string>
@@ -3585,7 +3585,7 @@ Lon %2$s</string>
     <string name="select_distance_route_will_recalc">Wählen Sie die Entfernung, nach der die Route neu berechnet wird.</string>
     <string name="recalculate_route_in_deviation">Neuberechnung der Route im Falle einer Abweichung</string>
     <string name="recalculate_route_distance_promo">Die Route wird neu berechnet, wenn die Entfernung von der Route zur aktuellen Position größer als der ausgewählte Wert ist.</string>
-    <string name="import_complete_description">Alle Daten aus %1$s werden importiert. Sie können die Schaltflächen unten verwenden, um den benötigten Teil der Anwendung zu öffnen, um sie zu verwalten.</string>
+    <string name="import_complete_description">Alle Daten aus %1$s werden importiert. Sie können die Schaltflächen unten verwenden, um den benötigten Teil der Anwendung zu öffnen und sie zu verwalten.</string>
     <string name="shared_string_square">Quadrat</string>
     <string name="shared_string_rhomb">Raute</string>
     <string name="shared_string_circle">Kreis</string>
@@ -3617,10 +3617,10 @@ Lon %2$s</string>
     <string name="custom_osmand_plugin">Benutzerdefiniertes OsmAnd-Plugin</string>
     <string name="slope_description">Farbliche Kennzeichnung von Pisten im Gelände.</string>
     <string name="replace_point_descr">Einen anderen Punkt durch diesen ersetzen</string>
-    <string name="changes_applied_to_profile">Die Änderungen wurden auf das %1$s Profil angewendet.</string>
-    <string name="settings_item_read_error">Konnte %1$s nicht lesen.</string>
-    <string name="settings_item_write_error">Konnte %1$s nicht schreiben.</string>
-    <string name="settings_item_import_error">Konnte %1$s nicht importieren.</string>
+    <string name="changes_applied_to_profile">Die Änderungen wurden auf das \'%1$s\' Profil angewendet.</string>
+    <string name="settings_item_read_error">Konnte nicht von \'%1$s\' lesen.</string>
+    <string name="settings_item_write_error">Konnte nicht nach \'%1$s\' schreiben.</string>
+    <string name="settings_item_import_error">Konnte nicht von \'%1$s\' importieren.</string>
     <string name="select_track_file">Wählen Sie eine Pfad-Datei</string>
     <string name="shared_string_languages">Sprachen</string>
     <string name="shared_string_language">Sprache</string>
@@ -3630,7 +3630,7 @@ Lon %2$s</string>
     <string name="ui_customization">Anpassung der Benutzeroberfläche</string>
     <string name="context_menu_actions">Aktionen im Kontextmenü</string>
     <string name="shared_string_hidden">Ausgeblendet</string>
-    <string name="reset_items_descr">Die Einstellungen werden nach dem Ausblenden auf den ursprünglichen Zustand zurückgesetzt.</string>
+    <string name="reset_items_descr">Das Ausblenden von Einstellungen setzt sie auf ihren ursprünglichen Zustand zurück.</string>
     <string name="main_actions">Hauptaktionen</string>
     <string name="move_inside_category">Sie können Elemente nur innerhalb dieser Kategorie verschieben.</string>
     <string name="shared_string_items">Elemente</string>
@@ -3667,20 +3667,45 @@ Lon %2$s</string>
     <string name="lang_ba">Baschkirisch</string>
     <string name="main_actions_descr">Hauptaktionen enthalten nur 4 Schaltflächen.</string>
     <string name="select_wikipedia_article_langs">Wählen Sie die Sprachen aus, in denen Wikipedia-Artikel auf der Karte erscheinen sollen. Sie können zwischen allen verfügbaren Sprachen wechseln, während Sie den Artikel lesen.</string>
-    <string name="hidden_items_descr">Diese Elemente werden aus dem Menü ausgeblendet, aber die dargestellten Optionen oder Plugins funktionieren weiterhin.</string>
+    <string name="hidden_items_descr">Diese Elemente werden aus dem Menü ausgeblendet, aber die entsprechenden Optionen oder Plugins funktionieren weiterhin.</string>
     <string name="reorder_or_hide_from">Ordnen Sie Elemente aus %1$s neu an oder blenden Sie sie aus.</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
-    <string name="osm_live_payment_subscription_management">Die Bezahlung wird nach der Bestätigung des Kaufs von ihrem Google Play Account abgebucht. 
-\n
-\nDas Abonnement verlängert sich automatisch, sofern es nicht vor dem Verlängerungsdatum gekündigt wird. Erst nach dem Verlängerungsdatum wird die Bezahlung für die Verlängerungsperiode (1 Monat/ 3 Monate/ 1 Jahr) von ihrem Account abgebucht.
-\n
-\nSie können ihre Abonnements in ihrem Google Play Einstellungen verwalten oder kündigen.</string>
+    <string name="osm_live_payment_subscription_management">Ihr Google Play-Konto wird beim Kauf eines Abonnements belastet,
+\nund wenn es abläuft (nach einem Monat, drei Monaten oder einem Jahr)
+\nverlängert es sich nicht von selbst, wenn es vorher in Ihren Google Play-Einstellungen gekündigt wurde.</string>
     <string name="search_poi_types">Suche nach POI-Typen</string>
-    <string name="search_poi_types_descr">Kombinieren Sie POI-Typen aus verschiedenen Kategorien. Tippen Sie auf den Schalter, um alle auszuwählen, tippen Sie auf die linke Seite, um die Kategorie auszuwählen.</string>
-    <string name="shared_string_divider"/>
+    <string name="search_poi_types_descr">Kombinieren Sie POI-Typen aus verschiedenen Kategorien. Tippen Sie auf \"Wechseln\", um alle auszuwählen, tippen Sie auf die linke Seite für die Kategorieauswahl.</string>
+    <string name="shared_string_divider">Trenner</string>
     <string name="quick_action_item">Schnellaktion</string>
     <string name="radius_ruler_item">Zirkel</string>
     <string name="measure_distance_item">Entfernungsmesser</string>
     <string name="map_markers_item">Kartenmarkierungen</string>
     <string name="favorites_item">Favoriten</string>
+    <string name="divider_descr">Elemente unterhalb dieses Punktes werden durch einen Trenner getrennt.</string>
+    <string name="tracker_item">OsmAnd Tracker</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="travel_item">Reisen (Wikivoyage und Wikipedia)</string>
+    <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
+    <string name="osmand_purchases_item">OsmAnd Einkäufe</string>
+    <string name="legend_item_description">Der Leitfaden zur Symbolik einer Karte</string>
+    <string name="navigation_profiles_item">Navigationsprofile</string>
+    <string name="release_3_7">• Neue Offline-Steigungskarten
+\n
+\n• Vollständige Anpassung von Favoriten und GPX-Wegpunkten - benutzerdefinierte Farben, Symbole, Formen
+\n
+\n• Anpassen der Reihenfolge der Elemente im Kontextmenü, Karte konfigurieren, Schublade
+\n
+\n• Wikipedia als separate Ebene in Karte konfigurieren, nur benötigte Sprachen auswählen
+\n
+\n• Erstellen Sie Ihre eigenen POI-Filter/Karten mit absoluter Flexibilität
+\n
+\n• Optionen zur Wiederherstellung von Einstellungen für benutzerdefinierte Profile hinzugefügt
+\n
+\n• Vollständige GPX-Routen aus der Navigation unterstützen Verkehrsspuren und vollständige Abbiegeanweisungen
+\n
+\n• Größe der Bedienoberfläche auf Tablets verbessert
+\n
+\n• Fehler mit RTL behoben
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-en-rGB/strings.xml b/OsmAnd/res/values-en-rGB/strings.xml
index e8ca75a7af..adaca42746 100644
--- a/OsmAnd/res/values-en-rGB/strings.xml
+++ b/OsmAnd/res/values-en-rGB/strings.xml
@@ -4,6 +4,17 @@
 		Our app defaults to American English with default strings in res/values
 		This file is manually maintained in res/values-en-rGB and should ONLY contain strings where a different spelling should be used for English as used in the United Kingdom
 	-->
+    <string name="add_edit_favorite">Add / Edit Favourite</string>
+    <string name="favorites_item">Favourites</string>
+    <string name="slope_description">Slope uses colours to visualise terrain steepness.</string>
+    <string name="search_street_in_neighborhood_cities">Search for street in neighbourhood cities</string>
+    <string name="custom_color">Custom colour</string>
+    <string name="keep_passed_markers_descr">Markers added as a group of Favourites or GPX waypoints marked "Passed" will remain on the map. If the group is not active, the markers will disappear from the map.</string>
+    <string name="osmand_net_previously_installed">All offline data in the old installed app will be supported by the new one, but Favourite points must be exported from the old app and then imported in the new one.</string>
+    <string name="import_file_favourites">Save data as GPX file or import waypoints to \'Favourites\'?</string>
+    <string name="fav_file_to_load_not_found">GPX file containing Favourites not found at {0}</string>
+    <string name="quick_favorites_show_favorites_dialog">Show Favourites dialog</string>
+    <string name="base_profile_descr_aircraft">Aeroplane, gliding</string>
     <string name="rendering_attr_currentTrackColor_name">GPX colour</string>
     <string name="rendering_attr_currentTrackColor_description">GPX colour</string>
     <string name="shared_string_color">Colour</string>
@@ -92,4 +103,4 @@
     <string name="analyze_on_map">Analyse on map</string>
     <string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
     <string name="show_transparency_seekbar">Show transparency slider</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index 5a17b4243f..7666aac08a 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -3811,4 +3811,9 @@
     <string name="poi_drinking_water_refill_yes">Plenigi per trinkebla akvo: jes</string>
     <string name="poi_drinking_water_refill_no">Plenigi per trinkebla akvo: ne</string>
     <string name="poi_drinking_water_refill_network">Plenigi per trinkebla akvo: reto</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">senprema</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">prema</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">grundakvo</string>
+    <string name="poi_fire_hydrant_type_pipe">tubo</string>
+    <string name="poi_fire_hydrant_pressure_filter">Premo de hidranto</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 313eff992d..403683dea7 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -2222,7 +2222,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="routing_attr_driving_style_balance_name">Ekvilibra</string>
     <string name="routing_attr_driving_style_safety_name">Preferi flankajn vojojn</string>
     <string name="routing_attr_relief_smoothness_factor_name">Elekti variecon de altitudo</string>
-    <string name="full_version_thanks">Dankon al ci por aĉeti la pagan version de OsmAnd!</string>
+    <string name="full_version_thanks">Dankon al vi por aĉeti la pagan version de OsmAnd!</string>
     <string name="parking_options">Parkumadaj agordoj</string>
     <string name="do_not_send_anonymous_app_usage">Ne sendi anoniman statistikon pri uzado</string>
     <string name="do_not_send_anonymous_app_usage_desc">OsmAnd kolektas informojn pri uzataj partoj de la aplikaĵo. Via pozicio neniam estas sendata, nek ion ajn, kion vi entajpas en la aplikaĵo nek detaloj pri ejoj foliumataj, serĉataj aŭ elŝutataj.</string>
@@ -2350,7 +2350,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="restore_purchases">Restarigi aĉetaĵojn</string>
     <string name="shared_string_visible">Videbla</string>
     <string name="analyze_on_map">Analizi sur mapo</string>
-    <string name="sea_depth_thanks">Dankon al ci por aĉeti marajn profundec-kurbojn!</string>
+    <string name="sea_depth_thanks">Dankon al vi por aĉeti marajn profundec-kurbojn!</string>
     <string name="index_item_depth_contours_osmand_ext">Maraj profundec-kurboj</string>
     <string name="index_item_depth_points_southern_hemisphere">Maraj profundec-kurboj de suda duonsfero</string>
     <string name="index_item_depth_points_northern_hemisphere">Maraj profundec-kurboj de norda duonsfero</string>
@@ -3568,10 +3568,10 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="shared_string_terrain">Tereno</string>
     <string name="slope_download_description">Kromaj mapoj estas necesaj por vidigi deklivecon sur la mapo.</string>
     <string name="slope_read_more">Pliaj informoj pri dekliveco en %1$s.</string>
-    <string name="terrain_empty_state_text">Aktivigu por vidigi nivelombrumon (reliefon) aŭ deklivecon. Pliaj informoj pri tiuj ĉi tipoj de mapoj troviĝas ĉe nia retpaĝo</string>
+    <string name="terrain_empty_state_text">Aktivigu por vidigi nivelombrumon (reliefon) aŭ deklivecon. Pliaj informoj pri tiuj ĉi tipoj de mapoj troviĝas sur nia retpaĝo.</string>
     <string name="download_slope_maps">Dekliveco</string>
     <string name="hillshade_description">Uzas tonojn de grizo por vidigi altaĵojn, montpintojn kaj malaltaĵojn.</string>
-    <string name="slope_description">Kolorigas mapon laŭ angulo de dekliveco.</string>
+    <string name="slope_description">Uzas kolorojn por vidigi angulon de dekliveco.</string>
     <string name="terrain_slider_description">Agordi minimuman kaj maksimuman pligrandigojn inter kiuj la tavolo estos montrata.</string>
     <string name="hillshade_download_description">Kromaj mapoj estas necesaj por vidigi tavolon de nivelombrumo.</string>
     <string name="shared_string_transparency">Travideblo</string>
@@ -3656,7 +3656,11 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="extra_maps_menu_group">Kromaj mapoj</string>
     <string name="download_unsupported_action">Nesubtenata ago %1$s</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
-    <string name="osm_live_payment_subscription_management">La pago estos prenita el via konto Google Play kiam aĉeti abonon kaj kiam ĝi malvalidiĝos (por monato/tri monatoj/jaro), kaj ne renoviĝos aŭtomate post esti rezignita per agordoj de Google Play.</string>
+    <string name="osm_live_payment_subscription_management">La pago estos prenita el via konto Google Play post konfirmi aĉeton.
+\n
+\n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la data de renoviĝo.
+\n
+\n Vi povas administri kaj rezigni viajn abonojn per agordoj de Google Play.</string>
     <string name="search_poi_types_descr">Miksi specojn de interesejoj el diversaj kategorioj. Frapetu “ŝaltilon” por elekti ĉiujn, frapetu ĉe maldekstre por elekti el la kategorio.</string>
     <string name="search_poi_types">Serĉi specojn de interesejoj</string>
     <string name="favorites_item">Ŝatataj ejoj</string>
@@ -3671,4 +3675,33 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="map_markers_item">Map‑markoj</string>
     <string name="legend_item_description">Priskribo al simboloj sur la mapo</string>
     <string name="navigation_profiles_item">Profiloj de navigo</string>
+    <string name="release_3_7">• novaj mapoj de dekliveco por malkonekta uzado
+\n 
+\n • plena alĝustigo de ŝatataj punktoj kaj GPX‑navigadpunktoj: propraj koloroj, emblemoj kaj formoj
+\n 
+\n • reordigi elementojn de la kunteksta menuo, menuo “konfiguri mapon” kaj tirmenuo
+\n 
+\n • Vikipedio kiel aparta tavolo vidigebla per la menuo “konfiguri mapon”, eblo elekti nur bezonatajn lingvojn
+\n 
+\n • krei viajn proprajn filtrilojn/mapojn de interesejoj, tute agordeblaj
+\n 
+\n • restarigi agordojn por propraj profiloj
+\n 
+\n • plenaj GPX‑spuroj en navigo, subteno por instrukcioj pri (voj)koridoroj kaj turnoj
+\n 
+\n • riparita grando de fasado ĉe tabulkomputiloj
+\n 
+\n • riparitaj eraroj pri lingvoj skribataj dekstre-maldekstren
+\n
+\n</string>
+    <string name="additional_actions_descr">Vi povas ekigi tiujn agojn per frapeti la butonon “%1$s”.</string>
+    <string name="quick_action_transport_hide">Kaŝi publikan transporton</string>
+    <string name="quick_action_transport_show">Montri publikan transporton</string>
+    <string name="quick_action_show_hide_transport">Montri/kaŝi publikan transporton</string>
+    <string name="quick_action_transport_descr">Butono por montri/kaŝi publikan transporton sur la mapo.</string>
+    <string name="create_edit_poi">Krei/redakti interesejon</string>
+    <string name="add_edit_favorite">Aldoni/forigi ŝatatan ejojn</string>
+    <string name="parking_positions">Pozicioj de parkumado</string>
+    <string name="reset_deafult_order">Restarigi implicitan ordigon de elementoj</string>
+    <string name="back_to_editing">Reen al redaktado</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 8d16d8d4fa..edc8f9711f 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -3825,4 +3825,9 @@
     <string name="poi_drinking_water_refill_yes">Recarga de agua potable: sí</string>
     <string name="poi_drinking_water_refill_no">Recarga de agua potable: no</string>
     <string name="poi_drinking_water_refill_network">Red de recarga de agua potable</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Succión</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Presurizado</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">Agua subterránea</string>
+    <string name="poi_fire_hydrant_type_pipe">Tubería</string>
+    <string name="poi_fire_hydrant_pressure_filter">Presión</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index fb0b1a1656..684160c613 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -3582,7 +3582,7 @@ Lon %2$s</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="shared_string_terrain">Terreno</string>
     <string name="hillshade_description">Mapa de sombreado usando sombras oscuras para mostrar las laderas, picos y tierras bajas.</string>
-    <string name="slope_description">La pendiente se visualiza en colores sobre el terreno.</string>
+    <string name="slope_description">La pendiente utiliza colores para visualizar la inclinación del terreno.</string>
     <string name="terrain_slider_description">Define los niveles de zoom mínimo y máximo en los que se mostrará la capa.</string>
     <string name="hillshade_download_description">Se necesitan mapas adicionales para ver el sombreado en el mapa.</string>
     <string name="slope_download_description">Se necesitan mapas adicionales para ver las pendientes en el mapa.</string>
@@ -3590,7 +3590,7 @@ Lon %2$s</string>
     <string name="shared_string_transparency">Transparencia</string>
     <string name="shared_string_zoom_levels">Niveles de zoom</string>
     <string name="shared_string_legend">Leyenda</string>
-    <string name="terrain_empty_state_text">Permite ver el sombreado o el mapa de pendientes. Puedes leer más sobre estos tipos de mapas en nuestro sitio</string>
+    <string name="terrain_empty_state_text">Permite ver el sombreado o el mapa de pendientes. Puedes leer más sobre estos tipos de mapas en nuestro sitio.</string>
     <string name="shared_string_hillshade">Sombreado</string>
     <string name="download_slope_maps">Pendientes</string>
     <string name="quick_action_show_hide_terrain">Mostrar/ocultar terreno</string>
@@ -3674,9 +3674,11 @@ Lon %2$s</string>
     <string name="extra_maps_menu_group">Mapas adicionales</string>
     <string name="download_unsupported_action">Acción «%1$s» no admitida</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
-    <string name="osm_live_payment_subscription_management">La cuenta de Google Play se carga al comprar una suscripción
-\ny al expirar (mes/trimestre/año),
-\nno se renovará si se cancela antes de esa fecha en los ajustes de Google Play.</string>
+    <string name="osm_live_payment_subscription_management">El pago será cargado a la cuenta de Google Play al confirmar la compra.
+\n
+\nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. La cuenta será cargada por el período de renovación (mes/trimestre/año) sólo en la fecha de renovación.
+\n
+\nPuedes administrar y cancelar las suscripciones accediendo a los ajustes de Google Play.</string>
     <string name="search_poi_types">Buscar por tipos de PDI</string>
     <string name="search_poi_types_descr">Combina tipos de PDI de diferentes categorías. Pulsa «Alternar» para marcar todo, pulsa el lado izquierdo para elegir una categoría.</string>
     <string name="tracker_item">OsmAnd Tracker</string>
@@ -3691,4 +3693,33 @@ Lon %2$s</string>
     <string name="osmand_purchases_item">Compras de OsmAnd</string>
     <string name="legend_item_description">La guía para la simbología de un mapa</string>
     <string name="navigation_profiles_item">Perfiles de navegación</string>
+    <string name="release_3_7">• Nuevos mapas sin conexión de las pendientes
+\n
+\n • Personalización más completa de los favoritos y puntos de referencia GPX (colores personalizados, iconos, formas)
+\n
+\n • Nueva personalización en el orden de los elementos en Configurar mapa, menú contextual y menú lateral
+\n
+\n • Wikipedia ahora se visualiza como una capa separada en Configurar mapa, elige sólo los idiomas necesarios
+\n
+\n • Crea tu propio filtro/mapas de puntos de interés, con total flexibilidad
+\n
+\n • Se añadieron opciones para restablecer los ajustes de los perfiles personalizados
+\n
+\n • Las rutas GPX para la navegación, ahora admiten los carriles de tráfico y completan las instrucciones de giro
+\n
+\n • Se ha corregido el tamaño de la interfaz en las tabletas
+\n
+\n • Se corrigieron los errores con RTL
+\n
+\n</string>
+    <string name="additional_actions_descr">Puedes acceder a estas acciones pulsando el botón «%1$s».</string>
+    <string name="quick_action_transport_hide">Ocultar transporte público</string>
+    <string name="quick_action_transport_show">Mostrar transporte público</string>
+    <string name="quick_action_show_hide_transport">Mostrar/ocultar transporte público</string>
+    <string name="quick_action_transport_descr">Un botón que muestra u oculta el transporte público en el mapa.</string>
+    <string name="create_edit_poi">Crear/Editar PDI</string>
+    <string name="parking_positions">Puestos de estacionamiento</string>
+    <string name="add_edit_favorite">Añadir / Editar favorito</string>
+    <string name="reset_deafult_order">Restaurar el orden de los elementos predefinidos</string>
+    <string name="back_to_editing">Volver a la edición</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index cb8671410a..d676e52c97 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -3690,4 +3690,23 @@ Lon %2$s</string>
     <string name="extra_maps_menu_group">Mapas adicionales</string>
     <string name="download_unsupported_action">Acción «%1$s» no admitida</string>
     <string name="custom_color">Color personalizado</string>
+    <string name="release_3_7">• Nuevos mapas sin conexión de las pendientes
+\n
+\n • Personalización más completa de los favoritos y puntos de referencia GPX (colores personalizados, iconos, formas)
+\n
+\n • Nueva personalización en el orden de los elementos en Configurar mapa, menú contextual y menú lateral
+\n
+\n • Wikipedia ahora se visualiza como una capa separada en Configurar mapa, elige sólo los idiomas necesarios
+\n
+\n • Crea tu propio filtro/mapas de puntos de interés, con total flexibilidad
+\n
+\n • Se añadieron opciones para restablecer los ajustes de los perfiles personalizados
+\n
+\n • Las rutas GPX para la navegación, ahora admiten los carriles de tráfico y completan las instrucciones de giro
+\n
+\n • Se ha corregido el tamaño de la interfaz en las tabletas
+\n
+\n • Se corrigieron los errores con RTL
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 448a1a4214..31aabfb944 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -3573,4 +3573,23 @@
     <string name="shared_string_language">Idioma</string>
     <string name="shared_string_all_languages">Todos los idiomas</string>
     <string name="wiki_menu_download_descr">Se necesitan mapas adicionales para ver los puntos de interés de Wikipedia en el mapa.</string>
+    <string name="release_3_7">• Nuevos mapas sin conexión de las pendientes
+\n
+\n • Personalización más completa de los favoritos y puntos de referencia GPX (colores personalizados, iconos, formas)
+\n
+\n • Nueva personalización en el orden de los elementos en Configurar mapa, menú contextual y menú lateral
+\n
+\n • Wikipedia ahora se visualiza como una capa separada en Configurar mapa, elige sólo los idiomas necesarios
+\n
+\n • Crea tu propio filtro/mapas de puntos de interés, con total flexibilidad
+\n
+\n • Se añadieron opciones para restablecer los ajustes de los perfiles personalizados
+\n
+\n • Las rutas GPX para la navegación, ahora admiten los carriles de tráfico y completan las instrucciones de giro
+\n
+\n • Se ha corregido el tamaño de la interfaz en las tabletas
+\n
+\n • Se corrigieron los errores con RTL
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 383d229d84..d6df4a3692 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -31,7 +31,7 @@
     <string name="choose_osmand_theme">پوستهٔ برنامه</string>
     <string name="accessibility_options">تنظیمات دسترسی آسان</string>
     <string name="select_address_activity">مشخص‌کردن نشانی</string>
-    <string name="favourites_list_activity">انتخاب نقطهٔ برگزیده</string>
+    <string name="favourites_list_activity">انتخاب نقطهٔ موردعلاقه</string>
     <string name="local_openstreetmap_act_title">تغییرات OsmAnd</string>
     <string name="map_widget_gps_info">اطلاعات GPS</string>
     <string name="access_arrival_time">زمان رسیدن</string>
@@ -149,7 +149,7 @@
     <string name="address_search_desc">جست‌وجوی نشانی</string>
     <string name="navpoint_search_desc">مختصات</string>
     <string name="transport_search_desc">در حمل‌ونقل عمومی</string>
-    <string name="favourites_search_desc">روشی برای جست‌وجو در نقاط برگزیده</string>
+    <string name="favourites_search_desc">روشی برای جست‌وجو در نقاط موردعلاقه</string>
     <string name="offline_navigation_not_available">مسیریابی آفلاین OsmAnd موقتاً در دسترس نیست.</string>
     <string name="left_side_navigation">رانندگی از چپ</string>
     <string name="left_side_navigation_descr">برای کشورهایی که از سمت چپ جاده می‌رانند.</string>
@@ -230,15 +230,15 @@
     <string name="shared_string_apply">به‌کارگیری</string>
     <string name="shared_string_add">افزودن</string>
     <string name="shared_string_no">خیر</string>
-    <string name="add_favorite_dialog_top_text">نام نقطهٔ برگزیده را بنویسید</string>
-    <string name="add_favorite_dialog_default_favourite_name">نقطهٔ برگزیده</string>
-    <string name="add_favorite_dialog_favourite_added_template">نقطهٔ برگزیدهٔ «{0}» اضافه شد.</string>
-    <string name="favourites_context_menu_edit">ویرایش نقطهٔ برگزیده</string>
-    <string name="favourites_context_menu_delete">حذف نقطهٔ برگزیده</string>
-    <string name="favourites_remove_dialog_msg">آیا نقطهٔ برگزیدهٔ «%s» را حذف می‌کنید؟</string>
-    <string name="favourites_remove_dialog_success">نقطهٔ برگزیدهٔ {0} حذف شد.</string>
+    <string name="add_favorite_dialog_top_text">نام نقطهٔ موردعلاقه را بنویسید</string>
+    <string name="add_favorite_dialog_default_favourite_name">نقطهٔ موردعلاقه</string>
+    <string name="add_favorite_dialog_favourite_added_template">نقطهٔ موردعلاقهٔ «{0}» اضافه شد.</string>
+    <string name="favourites_context_menu_edit">ویرایش نقطهٔ موردعلاقه</string>
+    <string name="favourites_context_menu_delete">حذف نقطهٔ موردعلاقه</string>
+    <string name="favourites_remove_dialog_msg">آیا نقطهٔ موردعلاقهٔ «%s» را حذف می‌کنید؟</string>
+    <string name="favourites_remove_dialog_success">نقطهٔ موردعلاقهٔ {0} حذف شد.</string>
     <string name="search_address">جست‌وجوی نشانی</string>
-    <string name="shared_string_add_to_favorites">افزودن به نقاط برگزیده</string>
+    <string name="shared_string_add_to_favorites">افزودن به «علاقه‌مندی‌ها»</string>
     <string name="use_english_names_descr">بین نام بومی و انگلیسی یکی را انتخاب کنید.</string>
     <string name="use_english_names">استفاده از نام‌های انگلیسی در نقشه‌ها</string>
     <string name="app_settings">تنظیمات برنامه</string>
@@ -289,8 +289,8 @@
     <string name="address">نشانی</string>
     <string name="shared_string_download_successful">دانلود شد</string>
     <string name="shared_string_downloading">در حال دانلود…</string>
-    <string name="fav_points_edited">نقطهٔ برگزیده ویرایش شد</string>
-    <string name="fav_points_not_exist">هیچ نقطهٔ برگزیده‌ای وجود ندارد</string>
+    <string name="fav_points_edited">نقطهٔ موردعلاقه ویرایش شد</string>
+    <string name="fav_points_not_exist">هیچ نقطهٔ موردعلاقه‌ای وجود ندارد</string>
     <string name="update_existing">جانشینی</string>
     <string name="only_show">مسیر را نشان بده</string>
     <string name="follow">شروع هدایت</string>
@@ -340,7 +340,7 @@
     <string name="search_position_current_location_search">در حال جست‌وجوی موقعیت…</string>
     <string name="search_position_current_location_found">موقعیت من (پیدا‌شده)</string>
     <string name="search_position_address">نشانی…</string>
-    <string name="search_position_favorites">نقاط برگزیده…</string>
+    <string name="search_position_favorites">"نقاط  موردعلاقه…"</string>
     <string name="search_position_undefined">نامشخص</string>
     <string name="delete_confirmation_msg">‏%1$s حذف شود؟</string>
     <string name="city_type_suburb">حومه</string>
@@ -650,7 +650,7 @@
     <string name="local_openstreetmap_were_uploaded">تعداد {0} یادداشت/POI آپلود شد</string>
     <string name="update_poi_does_not_change_indexes">تغییراتی که به‌وسیلهٔ برنامه روی POIها انجام می‌دهید روی نقشه‌های دانلود‌شده تأثیری ندارد. تغییرات روی فایل دیگری در دستگاه ذخیره می‌شود.</string>
     <string name="show_current_gpx_title">نمایش رد جاری</string>
-    <string name="fav_export_confirmation">قبلاً نقاط برگزیده را برون‌برد کرده‌اید و فایل آن وجود دارد. برون‌برد جدید را جانشین آن می‌کنید؟</string>
+    <string name="fav_export_confirmation">قبلاً نقاط موردعلاقه را برون‌برد کرده‌اید و فایل آن وجود دارد. برون‌برد جدید را جانشین آن می‌کنید؟</string>
     <string name="osmand_development_plugin_description">تنظیمات توسعه‌ای و امکانات عیب‌یابی را مشاهده کنید؛ مانند شبیه‌سازی ناوبری، آزمایش عملکرد رندر یا امتحان‌کردن پیام‌های گفتاری. 
 \nاین تنظیمات برای توسعه‌دهندگان فراهم شده است و برای کاربردهای عادی برنامه لازم نیست.</string>
     <string name="animate_route_off">پایان شبیه‌سازی</string>
@@ -707,8 +707,8 @@
     <string name="local_index_items_uploaded">%1$d مورد از %2$d مورد آپلود شد.</string>
     <string name="local_index_mi_upload_gpx">ارسال به OSM</string>
     <string name="show_more_map_detail_descr">برخی جزئیات نقشهٔ بُرداری (جاده‌ها و...) را در زوم‌های کمتر نشان می‌دهد.</string>
-    <string name="favourites_delete_multiple_succesful">نقطه‌های برگزیده حذف شد.</string>
-    <string name="favorite_delete_multiple">آیا از حذف %1$d نقطهٔ برگزیده و %2$d گروه مطمئن هستید؟</string>
+    <string name="favourites_delete_multiple_succesful">نقطه‌های موردعلاقه حذف شد.</string>
+    <string name="favorite_delete_multiple">آیا از حذف %1$d نقطهٔ موردعلاقه و %2$d گروه مطمئن هستید؟</string>
     <string name="basemap_missing">نقشه پایهٔ جهان را دانلود کنید تا نمایی از سراسر جهان با بزرگ‌نمایی کم داشته باشید.</string>
     <string name="local_index_installed">نسخهٔ محلی</string>
     <string name="installing_new_resources">بازکردن داده‌های جدید…</string>
@@ -808,7 +808,7 @@
     <string name="uploading">در حال آپلود…</string>
     <string name="uploading_data">در حال آپلود داده‌ها…</string>
     <string name="shared_string_clear_all">پاک‌کردن همه</string>
-    <string name="favorite">نقطهٔ برگزیده</string>
+    <string name="favorite">علاقه‌مندی‌ها</string>
     <string name="search_history_building">ساختمان: {0}، {1}، {2}</string>
     <string name="search_history_street">خیابان: {0}، {1}</string>
     <string name="search_history_int_streets">تقاطع: {0} x {1} به {2}</string>
@@ -859,10 +859,10 @@
     <string name="use_trackball">استفاده از گوی مکان‌نما</string>
     <string name="background_service_wait_int_descr">بیشترین زمان انتظار برای هر بار ثابت‌شدن موقعیت در پس‌زمینه را مشخص کنید.</string>
     <string name="background_service_wait_int">حداکثر زمان انتظار برای ثابت‌شدن</string>
-    <string name="fav_imported_sucessfully">برگزیده‌ها درون‌برد شد</string>
-    <string name="fav_file_to_load_not_found">فایل GPX حاوی نقاط برگزیده در {0} پیدا نشد</string>
-    <string name="fav_saved_sucessfully">نقاط برگزیده در {0} ذخیره شد</string>
-    <string name="no_fav_to_save">هیچ نقطهٔ برگزیده‌ای برای ذخیره‌کردن وجود ندارد</string>
+    <string name="fav_imported_sucessfully">علاقه‌مندی‌ها درون‌برد شد</string>
+    <string name="fav_file_to_load_not_found">فایل GPX حاوی نقاط موردعلاقه در {0} پیدا نشد</string>
+    <string name="fav_saved_sucessfully">علاقه‌مندی‌ها در {0} ذخیره شد</string>
+    <string name="no_fav_to_save">هیچ نقطهٔ موردعلاقه‌ای برای ذخیره‌کردن وجود ندارد</string>
     <string name="shared_string_import">درون‌برد</string>
     <string name="error_occurred_loading_gpx">بارکردن GPX ناموفق بود.</string>
     <string name="send_report">ارسال گزارش</string>
@@ -872,7 +872,7 @@
     <string name="thanks_yandex_traffic">اطلاعات ترافیک به‌لطف Yandex فراهم آمده.</string>
     <string name="layer_yandex_traffic">ترافیک Yandex</string>
     <string name="layer_route">مسیر</string>
-    <string name="shared_string_favorites">نقاط برگزیده</string>
+    <string name="shared_string_favorites">علاقه‌مندی‌ها</string>
     <string name="layer_osm_bugs">یادداشت‌های OSM (آنلاین)</string>
     <string name="shared_string_refresh">تازه‌سازی</string>
     <string name="items_were_selected">{0} مورد انتخاب شد</string>
@@ -912,7 +912,7 @@
 \n 
 \nمسیریابی موقتاْ با سرویس آنلاین CloudMade انجام می‌شود.</string>
     <string name="specified_dir_doesnt_exist">پوشهٔ موردنظر پیدا نشد.</string>
-    <string name="osmand_net_previously_installed">همهٔ داده‌های آفلاین از نسخهٔ قدیمی، در نسخهٔ جدید پشتیبانی می‌شوند، به‌جز نقاط برگزیده که باید آن‌ها را از نسخهٔ قدیمی برون‌برد کنید و در نسخهٔ جدید درون‌برد نمایید.</string>
+    <string name="osmand_net_previously_installed">همهٔ داده‌های آفلاین از نسخهٔ قدیمی، در نسخهٔ جدید پشتیبانی می‌شوند، به‌جز نقاط موردعلاقه که باید آن‌ها را از نسخهٔ قدیمی برون‌برد کنید و در نسخهٔ جدید درون‌برد نمایید.</string>
     <string name="build_installed">ساختِ {0} نصب شد ({1}).</string>
     <string name="km_h">km/h</string>
     <string name="old_map_index_is_not_supported">قالب دادهٔ «{0}» برای نقشه، ازرده‌خارج است و پشتیبانی نمی‌شود</string>
@@ -934,7 +934,7 @@
 \n- کارایی کامل در حالت آفلاین (قابلیت ذخیره‌سازی نقشه‌های بُرداری یا کاشی در حافظهٔ دستگاه) 
 \n- وجود نقشه‌های برداری و آفلاینِ سراسر جهان به‌صورت فشرده 
 \n- امکان دانلود نقشهٔ یک کشور یا منطقه مستقیماً از طریق برنامه 
-\n- امکان قراردادن نقشه‌های مختلف بر روی هم در چند لایه؛ مانند ردهای GPX یا مسیرپیمایی، نقاط توجه (POIها)، نقاط برگزیده، منحنی‌های میزان، ایستگاه‌های حمل‌ونقل عمومی، نقشه‌های دیگر با درصد شفافیت دلخواه 
+\n- امکان قراردادن نقشه‌های مختلف بر روی هم در چند لایه؛ مانند ردهای GPX یا مسیرپیمایی، نقاط توجه (POIها)، نقاط موردعلاقه، منحنی‌های میزان، ایستگاه‌های حمل‌ونقل عمومی، نقشه‌های دیگر با درصد شفافیت دلخواه 
 \n- جست‌وجوی آفلاین نقاط توجه (POIها) و نشانی‌ها 
 \n- مسیریابی آفلاین برای مسافت‌های متوسط 
 \n- نمایه‌های خودرو، دوچرخه و پیاده با قابلیت‌های اختیاری: 
@@ -963,7 +963,7 @@
 \n- امکان دانلود نامحدود نقشه‌های کشوری یا منطقه‌ای مستقیماً از طریق برنامه 
 \n- دسترسی به ویکی‌پدیا به‌صورت آفلاین (دانلود POIهای ویکی‌پدیا) که برای گردشگری بسیار مفید است 
 \n 
-\n- امکان قراردادن نقشه‌های مختلف بر روی هم در چند لایه؛ مانند ردهای GPX یا مسیرپیمایی، مکان‌های پرکاربرد یا POI، نقاط برگزیده، منحنی‌های میزان، ایستگاه‌های حمل‌ونقل عمومی، نقشه‌های دیگر با درصد شفافیت دلخواه 
+\n- امکان قراردادن نقشه‌های مختلف بر روی هم در چند لایه؛ مانند ردهای GPX یا مسیرپیمایی، مکان‌های پرکاربرد یا POI، نقاط موردعلاقه، منحنی‌های میزان، ایستگاه‌های حمل‌ونقل عمومی، نقشه‌های دیگر با درصد شفافیت دلخواه 
 \n 
 \n- جست‌وجوی آفلاین نقاط توجه (POIها) و نشانی‌ها 
 \n- مسیریابی آفلاین برای مسافت‌های متوسط 
@@ -1142,7 +1142,7 @@
     <string name="select_gpx">انتخاب فایل GPX…</string>
     <string name="route_descr_select_destination">مقصد را تنظیم کنید</string>
     <string name="shared_string_select_on_map">انتخاب روی نقشه</string>
-    <string name="shared_string_favorite">نقطهٔ برگزیده</string>
+    <string name="shared_string_favorite">موردعلاقه</string>
     <string name="route_preferences">ترجیحات مسیر</string>
     <string name="route_info">اطلاعات مسیر</string>
     <string name="use_displayed_track_for_navigation">از رد نمایش‌داده‌شده برای ناوبری استفاده می‌کنید؟</string>
@@ -1215,17 +1215,17 @@
     <string name="arrival_distance">اعلام رسیدن</string>
     <string name="arrival_distance_descr">چه‌زمانی پیام رسیدن به مقصد اعلام شود؟</string>
     <string name="shared_string_share">هم‌رسانی</string>
-    <string name="share_fav_subject">نقاط برگزیده به‌وسیلهٔ OsmAnd هم‌رسانی شد</string>
+    <string name="share_fav_subject">علاقه‌مندی‌ها به‌وسیلهٔ OsmAnd هم‌رسانی شد</string>
     <string name="use_points_as_intermediates">محاسبهٔ مسیر بین نقاط</string>
     <string name="rendering_value_pink_name">صورتی</string>
     <string name="rendering_value_brown_name">قهوه‌ای</string>
     <string name="osmo_edit_color">رنگ نمایش</string>
     <string name="int_days">روز</string>
     <string name="osmo_connect_menu">اتصال</string>
-    <string name="import_file_favourites">داده را در قالب فایل GPX ذخیره می‌کنید یا نقاط بین‌راهی آن را در برگزیده‌ها درون‌برد می‌کنید؟</string>
+    <string name="import_file_favourites">داده را در قالب فایل GPX ذخیره می‌کنید یا نقاط بین‌راهی آن را در علاقه‌مندی‌ها درون‌برد می‌کنید؟</string>
     <string name="gpx_file_is_empty">فایل GPX خالی</string>
     <string name="shared_string_tracks">ردها</string>
-    <string name="shared_string_my_favorites">نقاط برگزیده</string>
+    <string name="shared_string_my_favorites">علاقه‌مندی‌ها</string>
     <string name="shared_string_my_places">مکان‌های من</string>
     <string name="loading_smth">در حال بارکردن %1$s…</string>
     <string name="map_widget_plain_time">زمان جاری</string>
@@ -1256,7 +1256,7 @@
 \nنقاط</string>
     <string name="gpx_selection_track">%1$s 
 \nرد %2$s</string>
-    <string name="save_as_favorites_points">ذخیره به‌عنوان گروه برگزیده‌ها</string>
+    <string name="save_as_favorites_points">ذخیره به‌عنوان گروه نقاط موردعلاقه</string>
     <string name="select_destination_and_intermediate_points">تنظیم مقصدها</string>
     <string name="layer_amenity_label">برچسب‌های لایهٔ POI</string>
     <string name="show_zoom_buttons_navigation_descr">هنگام ناوبری دکمه‌های بزرگ‌نمایی را نشان بده.</string>
@@ -1287,7 +1287,7 @@
     <string name="shared_string_all">همه</string>
     <string name="shared_string_waypoints">نقاط بین‌راهی</string>
     <string name="way_alarms">هشدارهای ترافیکی</string>
-    <string name="speak_favorites">نقاط برگزیدهٔ نزدیک</string>
+    <string name="speak_favorites">نقاط موردعلاقهٔ نزدیک</string>
     <string name="speak_poi">نقاط توجه نزدیک</string>
     <string name="download_additional_maps">آیا نقشه‌های ناموجود را دانلود می‌کنید %1$s ‏(%2$d مگابایت)؟</string>
     <string name="shared_string_more">بیشتر…</string>
@@ -1414,7 +1414,7 @@
     <string name="anonymous_user">کاربر ناشناس</string>
     <string name="speed_limit_exceed">تاب‌آوری محدودیت سرعت</string>
     <string name="print_route">چاپ مسیر</string>
-    <string name="fav_point_dublicate">نام نقطهٔ برگزیده تکراری است</string>
+    <string name="fav_point_dublicate">نام نقطهٔ موردعلاقه تکراری است</string>
     <string name="text_size_descr">اندازهٔ نوشته‌های نقشه را تنظیم کنید.</string>
     <string name="text_size">اندازهٔ متن</string>
     <string name="traffic_warning_speed_limit">محدودیت سرعت</string>
@@ -1452,7 +1452,7 @@
     <string name="rendering_attr_trolleybusRoutes_name">مسیرهای اتوبوس برقی</string>
     <string name="rendering_attr_busRoutes_name">مسیرهای اتوبوس</string>
     <string name="rendering_category_routes">مسیرها</string>
-    <string name="fav_point_dublicate_message">برای پرهیز از تکرار، نام نقطهٔ برگزیده به %1$s تغییر یافت.</string>
+    <string name="fav_point_dublicate_message">برای پرهیز از تکرار، نام نقطهٔ موردعلاقه به %1$s تغییر یافت.</string>
     <string name="proxy_port_descr">شمارهٔ درگاه پروکسی را وارد کنید (مثلاً 8118).</string>
     <string name="proxy_host_descr">نام میزبان پروکسی را وارد کنید (مثلاً 127.0.0.1).</string>
     <string name="plugin_install_needs_network">برای نصب این افزونه به اینترنت وصل شوید.</string>
@@ -1464,7 +1464,7 @@
     <string name="voices">پیام‌های گفتاری</string>
     <string name="local_index_description">هر موردی را لمس کنید تا توضیحات بیشتری ببینید، برای غیرفعال یا پاک‌کردن لمس کنید و نگه دارید. داده‌های فعلی روی دستگاه (%1$s خالی):</string>
     <string name="speed_limit_exceed_message">حاشیهٔ تاب‌آوری محدودیت سرعت را انتخاب کنید؛ با گذشتن از این مقدار، آوای هشدار پخش می‌شود.</string>
-    <string name="fav_point_emoticons_message">نام نقطهٔ برگزیده به %1$s تغییر کرد تا رشتهٔ حاوی شکلک در فایل ذخیره شود.</string>
+    <string name="fav_point_emoticons_message">نام نقطهٔ موردعلاقه به %1$s تغییر کرد تا رشتهٔ حاوی شکلک در فایل ذخیره شود.</string>
     <string name="rendering_attr_hideHouseNumbers_name">پلاک خانه‌ها</string>
     <string name="application_dir_change_warning3">فایل‌های دادهٔ OsmAnd به مکان جدید منتقل شود؟</string>
     <string name="specified_directiory_not_writeable">نمی‌توان نقشه‌ها را در پوشهٔ موردنظر ایجاد کرد</string>
@@ -2010,7 +2010,7 @@
     <string name="shared_string_trip_recording">ضبط سفر</string>
     <string name="shared_string_navigation">ناوبری</string>
     <string name="osmand_running_in_background">اجرا در پس‌زمینه</string>
-    <string name="favourites_edit_dialog_title">اطلاعات نقطهٔ برگزیده</string>
+    <string name="favourites_edit_dialog_title">اطلاعات نقطهٔ موردعلاقه</string>
     <string name="simulate_your_location_stop_descr">شبیه‌سازی موقعیتتان را پایان دهید.</string>
     <string name="simulate_your_location_descr">با استفاده از یک مسیر محاسبه‌شده یا رد جی‌پی‌ایکسِ ضبط‌شده، موقعیتتان را شبیه‌سازی کنید.</string>
     <string name="looking_up_address">در حال یافتن نشانی</string>
@@ -2072,7 +2072,7 @@
     <string name="shared_string_others">دیگر</string>
     <string name="shared_string_release">تاریخ انتشار</string>
     <string name="quick_action_add_marker">افزودن نشانهٔ نقشه</string>
-    <string name="favourites_context_menu_add">افزودن نقطهٔ برگزیده</string>
+    <string name="favourites_context_menu_add">افزودن نقطهٔ موردعلاقه</string>
     <string name="poi_action_delete">حذف</string>
     <string name="poi_dialog_reopen">بازگشایی</string>
     <string name="get_plugin">دریافت</string>
@@ -2106,7 +2106,7 @@
     <string name="please_specify_poi_type">لطفاً نوع POI را مشخص کنید.</string>
     <string name="working_days">روزهای کاری</string>
     <string name="recent_places">مکان‌های اخیر</string>
-    <string name="favourites">نقاط برگزیده</string>
+    <string name="favourites">علاقه‌مندی‌ها</string>
     <string name="poi_deleted_localy">پس از آپلود تغییرات، POI حذف می‌شود</string>
     <string name="show_gpx">نمایش اطلاعات GPX</string>
     <string name="count_of_lines">تعداد خطوط</string>
@@ -2183,11 +2183,11 @@
     <string name="quick_action_add_parking">افزودن جای پارک</string>
     <string name="quick_action_new_action">افزودن کنش</string>
     <string name="quick_action_edit_action">اصلاح کنش</string>
-    <string name="quick_action_add_favorite">افزودن نقطهٔ برگزیده</string>
+    <string name="quick_action_add_favorite">افزودن نقطهٔ موردعلاقه</string>
     <string name="dialog_add_action_title">افزودن کنش</string>
     <string name="quick_actions_delete">حذف کنش</string>
     <string name="quick_actions_delete_text">آیا از حذف کنش «%s» مطمئن هستید؟</string>
-    <string name="quick_favorites_show_favorites_dialog">کادر نقاط برگزیده را نشان بده</string>
+    <string name="quick_favorites_show_favorites_dialog">کادر نقاط موردعلاقه را نشان بده</string>
     <string name="quick_action_add_marker_descr">دکمه‌ای برای ایجاد یک نشانه در مرکز صفحه.</string>
     <string name="quick_action_take_audio_note_descr">دکمه‌ای برای ایجاد یک یادداشت صوتی در مرکز صفحه.</string>
     <string name="quick_action_take_video_note_descr">دکمه‌ای برای ایجاد یک یادداشت ویدئویی در مرکز صفحه.</string>
@@ -2200,11 +2200,11 @@
     <string name="favorite_empty_place_name">مکان</string>
     <string name="quick_action_duplicates">برای پرهیز از تکرار، نام کنش فوری به «%1$s» تغییر یافت.</string>
     <string name="quick_action_duplicate">نام تکراری برای کنش فوری</string>
-    <string name="quick_action_showhide_favorites_descr">دکمه‌ای برای پنهان/آشکارکردن نقاط برگزیده روی نقشه.</string>
+    <string name="quick_action_showhide_favorites_descr">دکمه‌ای برای پنهان/آشکارکردن نقاط موردعلاقه روی نقشه.</string>
     <string name="quick_action_showhide_poi_descr">دکمه‌ای برای پنهان/آشکارکردن POIها روی نقشه.</string>
-    <string name="quick_action_showhide_favorites_title">آشکار/پنهان‌کردن نقاط برگزیده</string>
-    <string name="quick_action_favorites_show">نشان‌دادن نقاط برگزیده</string>
-    <string name="quick_action_favorites_hide">مخفی‌کردن نقاط برگزیده</string>
+    <string name="quick_action_showhide_favorites_title">آشکار/پنهان‌کردن نقاط موردعلاقه</string>
+    <string name="quick_action_favorites_show">نشان‌دادن نقاط موردعلاقه</string>
+    <string name="quick_action_favorites_hide">مخفی‌کردن نقاط موردعلاقه</string>
     <string name="quick_action_showhide_poi_title">آشکار/پنهان‌کردن POIها</string>
     <string name="quick_action_poi_show">نشان‌دادن %1$s</string>
     <string name="quick_action_poi_hide">پنهان‌کردن %1$s</string>
@@ -2214,7 +2214,7 @@
     <string name="quick_action_fav_name_descr">خالی بگذارید تا از نشانی یا نام محل استفاده شود.</string>
     <string name="quick_action_bug_descr">این نوشته در قسمت پیام درج می‌شود.</string>
     <string name="quick_action_bug_message">پیام</string>
-    <string name="quick_action_category_descr">دستهٔ ذخیره‌سازی نقطهٔ برگزیده:</string>
+    <string name="quick_action_category_descr">دستهٔ ذخیره‌سازی نقطهٔ موردعلاقه:</string>
     <string name="quick_action_gpx_category_descr">یکی از دسته‌ها را برگزینید.</string>
     <string name="quick_action_poi_list">لیست POI</string>
     <string name="quick_action_sh_poi_descr">یک یا چند دسته‌بندی POI را اضافه کنید تا روی نقشه نشان داده شوند.</string>
@@ -2238,8 +2238,8 @@
     <string name="mappilary_no_internet_desc">برای اینکه تصاویر مَپیلاری را ببینید به اینترنت وصل شوید.</string>
     <string name="retry">تلاش مجدد</string>
     <string name="add_line">افزودن خط</string>
-    <string name="empty_state_favourites">افزودن نقاط برگزیده</string>
-    <string name="empty_state_favourites_desc">برگزیده‌ها را درون‌برد کنید یا آن‌ها را روی نقشه علامت بزنید.</string>
+    <string name="empty_state_favourites">افزودن نقاط موردعلاقه</string>
+    <string name="empty_state_favourites_desc">نقاط موردعلاقه را درون‌برد کنید یا آن‌ها را روی نقشه علامت بزنید.</string>
     <string name="move_point">جابه‌جاکردن نقطه</string>
     <string name="make_round_trip_descr">یک کپی از مبدأ را به‌عنوان مقصد بیفزا.</string>
     <string name="make_round_trip">ایجاد سفر رفت‌وبرگشتی</string>
@@ -2315,7 +2315,7 @@
     <string name="quick_action_osmbugs_hide">پنهان‌کردن یادداشت‌های OSM</string>
     <string name="quick_action_showhide_osmbugs_descr">دکمه‌ای برای آشکار/پنهان کردن یادداشت‌های OSM بر روی نقشه.</string>
     <string name="sorted_by_distance">مرتب‌شده بر اساس مسافت</string>
-    <string name="search_favorites">جست‌وجو در نقاط برگزیده</string>
+    <string name="search_favorites">جست‌وجو در نقاط موردعلاقه</string>
     <string name="hillshade_menu_download_descr">«لایهٔ سایه‌روشن» را دانلود کنید تا سایه‌های عمودی را ببینید.</string>
     <string name="hillshade_purchase_header">افزونهٔ «منحنی‌های میزان» را نصب کنید تا طبقه‌بندی عمودی محدوده‌ها را ببینید.</string>
     <string name="hide_from_zoom_level">از این زوم پنهان شود</string>
@@ -2456,7 +2456,7 @@
 \n • نقشه را در راستای حرکتتان (یا قطب‌نما) تنظیم می‌کند 
 \n • موقعیت و سوی جهت‌گیری‌تان را نشان می‌دهد 
 \n • موقعیتتان را با دوستانتان هم‌رسانی کنید تا شما را پیدا کنند 
-\n • جاهایی را که دوست دارید در قسمت نقاط برگزیده ذخیره کنید 
+\n • جاهایی را که دوست دارید در قسمت علاقه‌مندی‌ها ذخیره کنید 
 \n • شیوهٔ نمایش نام‌های روی نقشه را انتخاب کنید: انگلیسی، محلی یا نویسه‌گردانی‌شده 
 \n • نمایش نقشه‌های تخصصی آنلاین، تصاویر ماهواره‌ای (بینگ) و رولایه‌های مختلف مانند ردهای GPX گردشگردی یا ناوبری با امکان تنظیم شفافیت
 \n</string>
@@ -2555,7 +2555,7 @@
     <string name="osmand_plus_extended_description_part3">نمایش نقشه 
 \n • نمایش موقعیت و جهت قرارگیری شما 
 \n • نقشه را در راستای حرکتتان (یا قطب‌نما) تنظیم می‌کند 
-\n • جاهایی را که دوست دارید در قسمت نقاط برگزیده ذخیره کنید 
+\n • جاهایی را که دوست دارید در قسمت نقاط موردعلاقه ذخیره کنید 
 \n • نقاط توجه (POI یا Points of interest) اطراف شما را نشان می‌دهد 
 \n • نمایش نقشه‌های تخصصی آنلاین، تصاویر ماهواره‌ای (بینگ) و رولایه‌های مختلف مانند ردهای GPX گردشگردی یا ناوبری با امکان تنظیم شفافیت 
 \n • شیوهٔ نمایش نام‌های روی نقشه را انتخاب کنید: انگلیسی، محلی یا نویسه‌گردانی‌شده
@@ -2594,9 +2594,9 @@
     <string name="shared_string_back">عقب</string>
     <string name="shared_string_view">نما</string>
     <string name="waypoints_added_to_map_markers">نقاط بین‌راهی به نشانه‌های نقشه اضافه شد</string>
-    <string name="import_gpx_file_description">را می‌توانید در قالب یک فایل GPX یا نقاط برگزیده درون‌برد کنید.</string>
+    <string name="import_gpx_file_description">را می‌توانید در قالب یک فایل GPX یا نقاط موردعلاقه درون‌برد کنید.</string>
     <string name="import_as_gpx">درون‌برد در قالب فایل GPX</string>
-    <string name="import_as_favorites">درون‌برد در قالب برگزیده‌ها</string>
+    <string name="import_as_favorites">درون‌برد به‌عنوان علاقه‌مندی‌ها</string>
     <string name="import_file">درون‌برد فایل</string>
     <string name="tap_on_map_to_hide_interface_descr">با لمس نقشه، دکمه‌ها و ابزارک‌ها را پنهان/آشکار کنید.</string>
     <string name="tap_on_map_to_hide_interface">حالت تمام‌صفحه</string>
@@ -2616,15 +2616,15 @@
     <string name="active_markers_descr">تعداد جهت‌نماها را مشخص کنید:</string>
     <string name="appearance_on_the_map">تنظیمات ظاهری</string>
     <string name="add_track_to_markers_descr">ردّی را انتخاب کنید تا نقاط بین‌راهیِ آن را به نشانه‌ها اضافه کنید.</string>
-    <string name="add_favourites_group_to_markers_descr">دسته‌ای از نقاط برگزیده را انتخاب کنید تا به نشانه‌ها اضافه شود.</string>
+    <string name="add_favourites_group_to_markers_descr">دسته‌ای از نقاط موردعلاقه را انتخاب کنید تا به نشانه‌ها اضافه شود.</string>
     <string name="shared_string_gpx_waypoints">نقاط بین‌راهی رد</string>
-    <string name="favourites_group">گروه نقاط برگزیده</string>
+    <string name="favourites_group">گروه نقاط موردعلاقه</string>
     <string name="add_group">افزودن گروه</string>
-    <string name="add_group_descr">گروهی از نقاط برگزیده یا نقاط بین‌راهی GPX را درون‌برد کنید.</string>
+    <string name="add_group_descr">گروهی از نقاط موردعلاقه یا نقاط بین‌راهی GPX را درون‌برد کنید.</string>
     <string name="empty_state_markers_active">روی نقشه نشانه‌گذاری کنید!</string>
     <string name="empty_state_markers_active_desc">مکان‌ها را به‌صورت کوتاه یا طولانی لمس کنید و سپس دکمهٔ پرچم را بزنید.</string>
     <string name="empty_state_markers_groups">گروه درون‌برد کنید</string>
-    <string name="empty_state_markers_groups_desc">گروه‌های نقاط برگزیده یا نقاط بین‌راهی را در قالب نشانه درون‌برد کنید.</string>
+    <string name="empty_state_markers_groups_desc">گروه‌های نقاط موردعلاقه یا نقاط بین‌راهی را در قالب نشانه درون‌برد کنید.</string>
     <string name="empty_state_markers_history_desc">نشانه‌هایی که به‌عنوان گذرانده مشخص شود در این صفحه نشان داده می‌شود.</string>
     <string name="shared_string_more_without_dots">بیشتر</string>
     <string name="looking_for_tracks_with_waypoints">در حال جست‌وجوی ردهای دارای نقطهٔ بین‌راهی</string>
@@ -2868,7 +2868,7 @@
     <string name="search_street">جست‌وجوی خیابان</string>
     <string name="start_search_from_city">ابتدا شهر/محل را انتخاب کنید</string>
     <string name="shared_string_restore">بازیابی</string>
-    <string name="keep_passed_markers_descr">نشانه‌هایی که در قالب گروهی از برگزیده‌ها یا نقاط بین‌راهی GPX وارد شده‌اند و از آن‌ها گذشته‌اید روی نقشه باقی می‌مانند. اگر گروه مربوط به آن‌ها را غیرفعال کنید، نشانه‌ها از روی نقشه محو می‌شوند.</string>
+    <string name="keep_passed_markers_descr">نشانه‌هایی که در قالب گروهی از نقاط موردعلاقه یا نقاط بین‌راهی GPX وارد شده‌اند و از آن‌ها گذشته‌اید روی نقشه باقی می‌مانند. اگر گروه مربوط به آن‌ها را غیرفعال کنید، نشانه‌ها از روی نقشه محو می‌شوند.</string>
     <string name="keep_passed_markers">نشانه‌های پشت سر گذاشته را روی نقشه نگه دار</string>
     <string name="markers_remove_dialog_msg">نشانهٔ %s حذف شود؟</string>
     <string name="edit_map_marker">ویرایش نشانه</string>
@@ -3609,7 +3609,7 @@
     <string name="recalculate_route_distance_promo">اگر فاصلهٔ مسیر تا موقعیت کنونی بیش از مقدار انتخابی باشد مسیر دوباره محاسبه می‌شود.</string>
     <string name="select_distance_route_will_recalc">فاصله‌ای که با گذشتن از آن، مسیریابی مجدد انجام شود چقدر باشد.</string>
     <string name="recalculate_route_in_deviation">مسیریابی مجدد در صورت خروج از مسیر</string>
-    <string name="slope_description">تصویرسازی رنگین روی ناهمواری‌ها شیب را نشان می‌دهد.</string>
+    <string name="slope_description">«شیب» با استفاده از رنگ‌ها، شیب ناهمواری‌ها را تصویرسازی می‌کند.</string>
     <string name="shared_string_square">مربع</string>
     <string name="shared_string_min">حداقل</string>
     <string name="shared_string_terrain">ناهمواری‌ها</string>
@@ -3677,9 +3677,11 @@
     <string name="extra_maps_menu_group">نقشه‌های بیشتر</string>
     <string name="download_unsupported_action">کنش پشتیبانی‌نشده %1$s</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
-    <string name="osm_live_payment_subscription_management">هنگام خرید اشتراک، بها از حساب گوگل‌پلی شما پرداخت می‌شود
-\nو هنگامی که مدت اشتراک پایان می‌یابد (ماهانه/سه‌ماهه/سالانه)،
-\nاگر پیش از پایان زمان اشتراک، اشتراک خود را از تنظیمات گوگل‌پلی لغو کرده باشید، به‌طور خودکار تمدید نخواهد شد.</string>
+    <string name="osm_live_payment_subscription_management">هنگام تأیید خرید، بها از حساب گوگل‌پلی شما پرداخت می‌شود.
+\n 
+\nاگر پیش از پایان زمان اشتراک، اشتراک خود را از تنظیمات گوگل‌پلی لغو کرده باشید، اشتراک شما به‌طور خودکار تمدید نخواهد شد. فقط در موعد تمدید اشتراک، برای دورهٔ اشتراک (ماهانه/سه‌ماهه/سالانه) از حسابتان برداشت می‌شود.
+\n
+\nبرای مدیریت یا لغو اشتراک خود، به تنظیمات گوگل‌پلی بروید.</string>
     <string name="tracker_item">OsmAnd tracker</string>
     <string name="legend_item_description">راهنمای نمادهای نقشه</string>
     <string name="navigation_profiles_item">پروفایل‌های ناوبری</string>
@@ -3710,10 +3712,32 @@
     <string name="measure_distance_item">اندازه‌گیری مسافت</string>
     <string name="travel_item">مسافرت (ویکی‌سفر و ویکی‌پدیا)</string>
     <string name="map_markers_item">نشانه‌های نقشه</string>
-    <string name="favorites_item">برگزیده‌ها</string>
+    <string name="favorites_item">علاقه‌مندی‌ها</string>
     <string name="subscription_osmandlive_item">اشتراک - OsmAnd Live</string>
     <string name="osmand_purchases_item">خریدهای OsmAnd</string>
     <string name="lang_scn">سیسیلی</string>
     <string name="lang_kk">قزاقی</string>
     <string name="lang_pnb">پنجابی</string>
+    <string name="release_3_7">• نقشه‌های آفلاین جدید شیب 
+\n 
+\n • شخصی‌سازی کامل نقاط موردعلاقه و نقاط بین‌راهی GPX - رنگ، نماد و شکل دلخواه 
+\n 
+\n • شخصی‌سازی ترتیب آیتم‌های منوی زمینه، پیکربندی نقشه و کشو 
+\n 
+\n • برای ویکی‌پدیا لایهٔ جداگانه‌ای در «پیکربندی نقشه» اضافه شد. فقط زبان‌های موردنیاز را برگزینید 
+\n 
+\n • نقشه/پالایهٔ POI خود را با نهایت انعطاف‌پذیری بسازید 
+\n 
+\n • گزینه‌هایی برای بازیابی تنظیمات پروفایل‌های سفارشی اضافه شد 
+\n 
+\n • مسیرهای GPX کامل که از ناوبری تولید می‌شود، تمام فرمان‌های گردش و خطوط عبوری را پشتیبانی می‌کنند. 
+\n 
+\n • اندازه‌های رابط کاربری برای تبلت‌ها اصلاح شد 
+\n 
+\n • مشکلاتی مربوط به RTL اصلاح شد
+\n
+\n</string>
+    <string name="back_to_editing">بازگشت به ویرایش</string>
+    <string name="create_edit_poi">ایجاد / ویرایش POI</string>
+    <string name="add_edit_favorite">افزودن / ویرایش نقطهٔ موردعلاقه</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml
index a77d2ff006..23bfa2ddf7 100644
--- a/OsmAnd/res/values-fi/strings.xml
+++ b/OsmAnd/res/values-fi/strings.xml
@@ -2544,4 +2544,20 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="osmand_purchases_item">OsmAnd ostot</string>
     <string name="legend_item_description">Kartan symboliikkaopas</string>
     <string name="navigation_profiles_item">Navigointiprofiilit</string>
+    <string name="lang_ba">baškiiri</string>
+    <string name="move_inside_category">Voit siirtää kohteita vain tämän kategorian sisällä.</string>
+    <string name="app_mode_ski_snowmobile">Moottorikelkka</string>
+    <string name="shared_string_languages">Kielet</string>
+    <string name="shared_string_language">Kieli</string>
+    <string name="shared_string_all_languages">Kaikki kielet</string>
+    <string name="lang_mn">mongoli</string>
+    <string name="lang_ky">kirgiisi</string>
+    <string name="lang_ce">tšetšeeni</string>
+    <string name="custom_color">Mukautettu väri</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="extra_maps_menu_group">Lisäkartat</string>
+    <string name="mapillary_item">OsmAnd + mapillary</string>
+    <string name="quick_action_item">Pikatoiminto</string>
+    <string name="radius_ruler_item">Sädeviivain</string>
+    <string name="download_unsupported_action">Toimintoa ei tuettu %1$s</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 4e9dd5bf93..2bc7dacfaf 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2514,7 +2514,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="date_added">Ajouté</string>
     <string name="order_by">Trier par :</string>
     <string name="marker_show_distance_descr">Sélectionnez comment indiquer sur la carte la distance et la direction des marques :</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Indiquez ci-dessous à quelle vitesse l\'orientation doit basculer de \'Sens du déplacement\' à \'Boussole\'.</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Indiquez ci-dessous la vitesse à laquelle l\'orientation doit basculer de \'Sens du déplacement\' à \'Boussole\'.</string>
     <string name="passed">Dernière utilisation : %1$s</string>
     <string name="show_guide_line">Afficher les indications de direction</string>
     <string name="show_arrows_on_the_map">Afficher les flèches sur la carte</string>
@@ -2881,7 +2881,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="arrive_at_time">Arrivée à %1$s</string>
     <string name="cubic_m">m³</string>
     <string name="metric_ton">t</string>
-    <string name="shared_string_capacity">Сapacité</string>
+    <string name="shared_string_capacity">Capacité</string>
     <string name="shared_string_width">Largeur</string>
     <string name="shared_string_height">Hauteur</string>
     <string name="routeInfo_roadClass_name">Type de route</string>
@@ -3562,7 +3562,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="shared_string_terrain">Terrain</string>
     <string name="hillshade_description">Carte ombrée utilisant des nuances sombres pour visualiser les pistes, les sommets et les plaines.</string>
-    <string name="slope_description">La piste est visualisée en couleurs sur le terrain.</string>
+    <string name="slope_description">La piste est colorée selon sa pente.</string>
     <string name="terrain_slider_description">Définissez les niveaux de zoom minimum et maximum pour lesquels la couche sera affichée.</string>
     <string name="hillshade_download_description">Des cartes supplémentaires sont nécessaires pour afficher l\'ombrage du relief sur la carte.</string>
     <string name="slope_download_description">Des cartes supplémentaires sont nécessaires pour afficher les pistes sur la carte.</string>
@@ -3648,9 +3648,11 @@ représentant la zone : %1$s x %2$s</string>
     <string name="download_unsupported_action">Action %1$s non prise en charge</string>
     <string name="lang_ky">Kirghize</string>
     <string name="lang_gu">Gujarati</string>
-    <string name="osm_live_payment_subscription_management">Le paiement sera débité de votre compte Google Play dès confirmation de l\'abonnement
-\npuis automatiquement à la fin de chaque échéance (mensuelle / trimestrielle / annuelle).
-\nVous pouvez gérer et annuler ces abonnements depuis vos paramètres Google Play.</string>
+    <string name="osm_live_payment_subscription_management">Le paiement sera débité de votre compte Google Play dès confirmation de l\'achat.
+\n
+\nA moins qu\'il ne soit annulé avant sa date de renouvellement, l\'abonnement sera automatiquement débité à chaque échéance (mensuelle / trimestrielle / annuelle). 
+\n
+\nVous pouvez gérer et annuler vos abonnements dans vos paramètres Google Play.</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="search_poi_types_descr">Combinez des PI de différentes catégories. Appuyez pour tout sélectionner, appuyez sur le côté gauche pour sélectionner les catégories.</string>
     <string name="search_poi_types">Rechercher des types de PI</string>
@@ -3666,4 +3668,33 @@ représentant la zone : %1$s x %2$s</string>
     <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
     <string name="osmand_purchases_item">Achats OsmAnd</string>
     <string name="navigation_profiles_item">Profils de navigation</string>
+    <string name="release_3_7">- Nouvelles cartes des pistes hors ligne
+\n
+\n - Personnalisation complète des favoris et des points de passage GPX - couleurs, icônes et formes personnalisées
+\n
+\n - Personnaliser l\'ordre des éléments dans le menu contextuel, la configuration de la carte, le tiroir
+\n
+\n - Wikipédia comme couche séparée dans Paramétrer la carte, sélectionnez uniquement les langues nécessaires
+\n
+\n - Créez vos propres filtres de PI avec une flexibilité totale
+\n
+\n - Ajout d\'options permettant de restaurer les paramètres des profils personnalisés
+\n
+\n - Les routes GPX utilisées en navigation prennent en charge les voies de circulation et les instructions de virage complètes
+\n
+\n - Correction des tailles sur les tablettes
+\n
+\n - Correction de bugs avec RTL
+\n
+\n</string>
+    <string name="additional_actions_descr">Vous pouvez accéder à ces actions en appuyant sur le bouton \"%1$s\".</string>
+    <string name="quick_action_transport_hide">Masquer les transports publics</string>
+    <string name="quick_action_transport_show">Afficher les transports publics</string>
+    <string name="quick_action_show_hide_transport">Afficher / masquer les transports publics</string>
+    <string name="quick_action_transport_descr">Bouton pour afficher ou masquer les transports publics sur la carte.</string>
+    <string name="create_edit_poi">Créer / Modifier un PI</string>
+    <string name="parking_positions">Emplacements de stationnement</string>
+    <string name="add_edit_favorite">Ajouter / Modifier un favori</string>
+    <string name="reset_deafult_order">Rétablir l\'ordre par défaut des éléments</string>
+    <string name="back_to_editing">Retour en modification</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gl/phrases.xml b/OsmAnd/res/values-gl/phrases.xml
index 1a4aedeafd..080020ab06 100644
--- a/OsmAnd/res/values-gl/phrases.xml
+++ b/OsmAnd/res/values-gl/phrases.xml
@@ -434,7 +434,7 @@
     <string name="poi_railway_station">Estación de trens</string>
     <string name="poi_ferry_terminal">Terminal dos ferris</string>
     <string name="poi_observation_tower">Atalaia</string>
-    <string name="poi_bell_tower">Campanario</string>
+    <string name="poi_bell_tower">Campanil</string>
     <string name="poi_recycling_centre">Centro de reciclaxe</string>
     <string name="poi_recycling_glass">Vidro</string>
     <string name="poi_recycling_container">Contedor</string>
@@ -1019,7 +1019,7 @@
     <string name="poi_self_service">Auto-servizo</string>
     <string name="poi_automated">Automatizado</string>
     <string name="poi_parking_type">Tipo de aparcadoiro</string>
-    <string name="poi_covered">Coberto</string>
+    <string name="poi_covered">Cuberto</string>
     <string name="poi_subway_station_filter">Estación de metro</string>
     <string name="poi_ferry_terminal_cargo">Carga</string>
     <string name="poi_bicycle_parking_type">Tipo de aparcadoiro</string>
@@ -1278,7 +1278,7 @@
     <string name="poi_information_tactile_model">Modelo táctil</string>
     <string name="poi_covered_yes">Si</string>
     <string name="poi_fireplace_no">Sen lareira</string>
-    <string name="poi_covered_no">Descoberto</string>
+    <string name="poi_covered_no">Descuberto</string>
     <string name="poi_tactile_paving_yes">Si</string>
     <string name="poi_railway_level_crossing">Pasaxe a nivel</string>
     <string name="poi_horse_riding">Equitación</string>
@@ -2154,7 +2154,7 @@
     <string name="poi_male_no">Prohibido para homes</string>
     <string name="poi_female_yes">Mulleres</string>
     <string name="poi_female_no">Prohibido para mulleres</string>
-    <string name="poi_indoor_yes">Coberto</string>
+    <string name="poi_indoor_yes">Cuberto</string>
     <string name="poi_diaper_table_count">Cambiadoiro de cueiros</string>
     <string name="poi_diaper_yes">Con cambiadoiro de cueiros</string>
     <string name="poi_diaper_no">Sen cambiadoiro de cueiros</string>
@@ -3798,4 +3798,17 @@
     <string name="poi_tactile_paving_contrasted">Contrastado</string>
     <string name="poi_tactile_paving_primitive">Primitivo</string>
     <string name="poi_tactile_paving_incorrect">Incorrecto</string>
+    <string name="poi_drinking_water_refill_network">Rede de recarga de auga potábel</string>
+    <string name="poi_drinking_water_refill_no">Recarga de auga potábel: non</string>
+    <string name="poi_drinking_water_refill_yes">Recarga de auga potábel: si</string>
+    <string name="poi_seamark_obstruction">Obstrución</string>
+    <string name="poi_seamark_water_level_below_mwl">Nivel da auga: por debaixo do nivel medio da auga</string>
+    <string name="poi_seamark_water_level_above_mwl">Nivel da auga: por encima do nivel medio da auga</string>
+    <string name="poi_seamark_water_level_floating">Nivel da auga: flotante</string>
+    <string name="poi_seamark_water_level_floods">Nivel da auga: inundacións</string>
+    <string name="poi_seamark_water_level_awash">Nivel da auga: inundado</string>
+    <string name="poi_seamark_water_level_covers">Nivel da auga: cuberto</string>
+    <string name="poi_seamark_water_level_dry">Nivel da auga: seco</string>
+    <string name="poi_seamark_water_level_submerged">Nivel da auga: somerxido</string>
+    <string name="poi_seamark_water_level_part_submerged">Nivel da auga: parcialmente somerxido</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index f05ffa8c90..9abfab3780 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="fav_point_dublicate_message">Favorito renomeado a %1$s para evitar a duplicación.</string>
-    <string name="text_size_descr">Configura-lo tamaño da letra no mapa.</string>
+    <string name="text_size_descr">Configurar o tamaño da letra no mapa.</string>
     <string name="text_size">Tamaño da letra</string>
     <string name="traffic_warning_speed_limit">Límite da velocidade</string>
     <string name="traffic_warning_border_control">Control fronteirizo</string>
@@ -27,7 +27,7 @@
     <string name="save_track_to_gpx_globally">Rexistrar a pista nun ficheiro GPX</string>
     <string name="save_track_to_gpx_globally_descr">Rexistra a posición nun ficheiro GPX, e podes activalo ou desactivalo empregando o trebello de gravación GPX no mapa.</string>
     <string name="save_current_track_descr">Garda a pista actual coma ficheiro GPX agora.</string>
-    <string name="save_current_track">Garda-la pista actual</string>
+    <string name="save_current_track">Gardar a pista actual</string>
     <string name="save_track_to_gpx">Rexistrar a pista de xeito automático durante a navegación</string>
     <string name="save_track_to_gpx_descrp">Unha pista do GPX gárdarase de xeito automático no cartafol das pistas durante a navegación.</string>
     <string name="save_track_interval_globally">Intre de rexistro</string>
@@ -86,15 +86,15 @@
     <string name="rendering_attr_showSurfaceGrade_name">Amosar calidade das estradas</string>
     <string name="rendering_attr_showSurfaces_name">Amosar superficie das estradas</string>
     <string name="rendering_attr_showCycleRoutes_name">Amosar ciclovías</string>
-    <string name="no_index_file_to_download">Non foi posíbel atopar as baixadas; comproba a túa conexión á Internet.</string>
+    <string name="no_index_file_to_download">Non foi posíbel atopar as descargas; comproba a túa conexión á Internet.</string>
     <string name="select_index_file_to_download">Non se atopou ren. Se non dás atopado a túa rexión, a podes facer ti mesmo (ollar https://osmand.net).</string>
     <string name="none_selected_gpx">Especifica primeiro un ficheiro GPX mantendo premido.</string>
     <string name="local_index_select_gpx_file">Escoller unha pista</string>
     <string name="gpx_split_interval">Intre de división</string>
     <string name="sort_by_distance">Ordenar pola distancia</string>
     <string name="sort_by_name">Ordenar polo nome</string>
-    <string name="show_zoom_buttons_navigation_descr">Amosa-los botóns de achegamento durante a navegación.</string>
-    <string name="show_zoom_buttons_navigation">Amosa-los botóns de achegamento</string>
+    <string name="show_zoom_buttons_navigation_descr">Amosar os botóns de achegamento durante a navegación.</string>
+    <string name="show_zoom_buttons_navigation">Amosar os botóns de achegamento</string>
     <string name="save_as_favorites_points">Gardar coma grupo dos Favoritos</string>
     <string name="select_destination_and_intermediate_points">Estabelecer destinos</string>
     <string name="layer_amenity_label">Nomes dos PDI sobrepostos</string>
@@ -139,7 +139,7 @@
     <string name="osmo_edit_color">Cor da pantalla</string>
     <string name="int_days">días</string>
     <string name="osmo_connect_menu">Conectar</string>
-    <string name="use_points_as_intermediates">Calcula-la rota entre puntos</string>
+    <string name="use_points_as_intermediates">Calcular a ruta entre puntos</string>
     <string name="always_center_position_on_map">Amosar posición sempre no centro</string>
     <string name="voice_pref_title">Voz</string>
     <string name="misc_pref_title">Varios</string>
@@ -203,17 +203,17 @@
     <string name="index_name_italy">Europa - Italia</string>
     <string name="index_name_gb">Europa - Gran Bretaña</string>
     <string name="calculate_osmand_route_without_internet">Cálculo sen conexión do segmento da rota do OsmAnd</string>
-    <string name="gpx_option_calculate_first_last_segment">Calcula-la rota do OsmAnd para o primeiro e o derradeiro segmento</string>
+    <string name="gpx_option_calculate_first_last_segment">Calcular a ruta do OsmAnd para o primeiro e o derradeiro segmento</string>
     <string name="use_displayed_track_for_navigation">Desexa empregar a pista amosada para a navegación\?</string>
     <string name="keep_and_add_destination_point">Engadir coma seguinte destino</string>
-    <string name="select_gpx">Elixir GPX…</string>
+    <string name="select_gpx">Escoller GPX…</string>
     <string name="route_descr_select_destination">Estabelecer destino</string>
     <string name="shared_string_select_on_map">Seleccionar no mapa</string>
     <string name="shared_string_favorite">Favorito</string>
     <string name="route_preferences">Preferencias da rota</string>
     <string name="route_info">Información da rota</string>
-    <string name="routing_attr_prefer_motorway_name">Preferi-las autoestradas</string>
-    <string name="routing_attr_prefer_motorway_description">Preferi-las autoestradas</string>
+    <string name="routing_attr_prefer_motorway_name">Preferir as autoestradas</string>
+    <string name="routing_attr_prefer_motorway_description">Preferir as autoestradas</string>
     <string name="routing_attr_avoid_toll_name">Sen estradas de portaxe ou peaxe</string>
     <string name="routing_attr_avoid_toll_description">Evitar estradas de portaxe ou peaxe</string>
     <string name="routing_attr_avoid_unpaved_name">Non hai estradas sen pavimentar</string>
@@ -227,9 +227,9 @@
     <string name="android_19_location_disabled">Dende o Android 4.4 (KitKat), o cartafol de almacenamento antiga (%s) atópase en desuso. Copiar todos os ficheiros do OsmAnd á nova localización de almacenamento\? 
 \n Nota 1: Os ficheiros antigos permanecerán intactos (pero poden ser eliminados de xeiti manual). 
 \n Nota 2: Na nova localización de almacenamento será imposíbel compartir ficheiros entre o OsmAnd e o OsmAnd+.</string>
-    <string name="copying_osmand_one_file_descr">Estase a copia-lo ficheiro (%s) ó seu novo destino…</string>
-    <string name="copying_osmand_files_descr">Estase a copia-los ficheiros do OsmAnd ó seu novo destino (%s)…</string>
-    <string name="copying_osmand_files">Estase a copia-los ficheiros de datos do OsmAnd…</string>
+    <string name="copying_osmand_one_file_descr">Estase a copiar o ficheiro (%s) ó seu novo destino…</string>
+    <string name="copying_osmand_files_descr">Estanse a copiar os ficheiros do OsmAnd ó seu novo destino (%s)…</string>
+    <string name="copying_osmand_files">Estanse a copiar os ficheiros de datos do OsmAnd…</string>
     <string name="calculate_osmand_route_gpx">Cálculo da rota do OsmAnd sen conexión</string>
     <string name="app_mode_truck">Camión</string>
     <string name="guidance_preferences_descr">Preferencias da navegación</string>
@@ -249,7 +249,7 @@
     <string name="app_mode_aircraft">Aeronave</string>
     <string name="local_osm_changes_delete_all_confirm">Eliminar %1$d modificación(s) no OSM\?</string>
     <string name="shared_string_delete_all">Eliminar todo</string>
-    <string name="animate_routing_route_not_calculated">Calcula-la rota primeiro</string>
+    <string name="animate_routing_route_not_calculated">Calcular a ruta primeiro</string>
     <string name="animate_routing_route">"Simular empregando a rota calculada "</string>
     <string name="animate_routing_gpx">Simular empregando pista GPX</string>
     <string name="shared_string_remember_my_choice">Lembrar escolla</string>
@@ -325,10 +325,10 @@
     <string name="gpx_saved_sucessfully">O ficheiro GPX foi gardado en {0}</string>
     <string name="osmand_distance_planning_plugin_description">Crea camiños premendo no mapa, empregando ou modificando ficheiros GPX existentes, para planificar unha viaxe e medir a distancia entre puntos. Os resultados poden gardarse coma un ficheiro GPX e empregarse despois para a orientación.</string>
     <string name="osmand_distance_planning_plugin_name">Calculadora de distancias e ferramenta de planificación</string>
-    <string name="use_distance_measurement_help">* Prema para marcar un punto. 
-\n * Manteña premido o mapa para riscar-lo punto anterior. 
-\n * Manteña premido nun punto para ollar e engadi-la descrición. 
-\n * Prema o trebello da medición para ollar máis accións.</string>
+    <string name="use_distance_measurement_help">* Preme para marcar un punto. 
+\n * Mantén premido o mapa para riscar o punto anterior. 
+\n * Mantén premido nun punto para ollar e engadir a descrición. 
+\n * Preme o trebello de medición para ollar máis accións.</string>
     <string name="shared_string_do_not_show_again">Non amosar de novo</string>
     <string name="distance_measurement_start_editing">Comezar a editar</string>
     <string name="distance_measurement_finish_editing">Rematar coa edición</string>
@@ -347,7 +347,7 @@
     <string name="cancel_route">Rexeitar rota</string>
     <string name="cancel_navigation">Deter a navegación</string>
     <string name="clear_destination">Limpar o destino</string>
-    <string name="download_using_mobile_internet">Non estás conectado a unha rede Wi-Fi. Emprega-la conexión actual á Internet para baixar\?</string>
+    <string name="download_using_mobile_internet">Non estás conectado a unha rede Wi-Fi. Empregar a conexión actual á Internet para baixar\?</string>
     <string name="street_name">Nome da rúa</string>
     <string name="hno">Número do edificio</string>
     <string name="website">Sitio web</string>
@@ -358,7 +358,7 @@
     <string name="choose_osmand_theme">Tema da aplicación</string>
     <string name="accessibility_options">Opcións de accesibilidade</string>
     <string name="select_address_activity">Especificar enderezo</string>
-    <string name="favourites_list_activity">Elixir Favorito</string>
+    <string name="favourites_list_activity">Escoller Favorito</string>
     <string name="local_openstreetmap_act_title">Modificacións de OSM</string>
     <string name="shared_string_more_actions">Outras accións</string>
     <string name="layer_hillshade">Capa de sombreado</string>
@@ -385,7 +385,7 @@
     <string name="recording_context_menu_precord">Fotografar</string>
     <string name="dropbox_plugin_description">Sincroniza pistas e notas multimedia coa túa conta do Dropbox.</string>
     <string name="dropbox_plugin_name">Plugin do Dropbox</string>
-    <string name="intermediate_points_change_order">Muda-la orde</string>
+    <string name="intermediate_points_change_order">Mudar a orde</string>
     <string name="srtm_paid_version_msg">Coida a posibilidade de mercar o plugin de \'Curvas de nivel\' para así apoiar o seu desenvolvemento.</string>
     <string name="srtm_paid_version_title">Plugin de curvas de nivel</string>
     <string name="av_def_action_choose">Baixo demanda\?</string>
@@ -395,7 +395,7 @@
     <string name="av_widget_action">Acción predeterminada do trebello</string>
     <string name="av_video_format_descr">Formato de saída do vídeo:</string>
     <string name="av_video_format">Formato de saída do vídeo</string>
-    <string name="av_use_external_recorder_descr">Emprega-la gravadora do sistema para o vídeo.</string>
+    <string name="av_use_external_recorder_descr">Empregar a gravadora do sistema para o vídeo.</string>
     <string name="av_use_external_recorder">Empregar a gravadora do sistema</string>
     <string name="av_use_external_camera_descr">Empregar a aplicación do sistema para as imaxes.</string>
     <string name="av_use_external_camera">Empregar a aplicación da cámara</string>
@@ -443,7 +443,7 @@
     <string name="rendering_attr_alpineHiking_name">Escala de sendeirismo alpino (SAC)</string>
     <string name="rendering_attr_alpineHiking_description">Amosar rotas seguindo a escala SAC.</string>
     <string name="rendering_attr_hikingRoutesOSMC_name">Sobreposición dos símbolos de sendeirismo</string>
-    <string name="rendering_attr_hikingRoutesOSMC_description">Renderiza-los camiños segundo as pistas do OSMC.</string>
+    <string name="rendering_attr_hikingRoutesOSMC_description">Renderizar os camiños segundo as pistas do OSMC.</string>
     <string name="rendering_attr_noAdminboundaries_name">Fronteiras</string>
     <string name="rendering_attr_noAdminboundaries_description">Agochar fronteiras rexionais (niveis administrativos do 5 ó 9).</string>
     <string name="map_widget_max_speed">Límite da velocidade</string>
@@ -456,7 +456,7 @@
     <string name="safe_mode_description">Executar a aplicación no modo seguro (empregando o código máis lento do Android no canto do nativo).</string>
     <string name="safe_mode">Modo seguro</string>
     <string name="native_library_not_running">A aplicación está a ser executada no modo seguro (desactivar nos \"Axustes\").</string>
-    <string name="close_changeset">Fecha-lo conxunto de trocos</string>
+    <string name="close_changeset">Pechar o conxunto de modificacións</string>
     <string name="zxing_barcode_scanner_not_found">O dixitalizador do códigos de barras ZXing non está instalado. Quéreo procurar na Google Play\?</string>
     <string name="rendering_attr_roadColors_description">Escoller un esquema de cores das estradas:</string>
     <string name="rendering_attr_roadColors_name">Esquema de cores de estrada</string>
@@ -473,7 +473,7 @@
     <string name="context_menu_item_first_intermediate_point">Engadir como primeiro destino intermedio</string>
     <string name="add_as_last_destination_point">Engadir coma derradeiro destino intermedio</string>
     <string name="add_as_first_destination_point">Engadir coma primeiro destino intermedio</string>
-    <string name="replace_destination_point">Substituí-lo destino</string>
+    <string name="replace_destination_point">Substituír o destino</string>
     <string name="new_destination_point_dialog">Xa existe un destino:</string>
     <string name="shared_string_target_points">Destinos</string>
     <string name="intermediate_point_too_far">O destino intermedio %1$s está demasiado lonxe da estrada máis próxima.</string>
@@ -509,69 +509,31 @@
     <string name="osmand_short_description_80_chars">Visualización e navegación móbil de mapas globais do OSM con e sen conexión</string>
     <string name="osmand_long_description_1000_chars">"OsmAnd (Indicacións de navegación automatizadas do OSM)
 \n
-\n
-\n
-\n
 \n O OsmAnd é unha aplicación de navegación de código aberto con acceso a unha ampla variedade de datos globais do OSM. Tódolos mapas dos datos (mapas vectoriais ou teselas) poden seren almacenados no cartón de memoria do teléfono móbil para empregalos sen conexión. O OsmAnd tamen fornece a funcionalidade de cálculo de rotas sen conexión, incluíndo a guía por voz paso a paso.
 \n
-\n
-\n
-\n
 \n Algunhas das funcións principais:
-\n
-\n
 \n  - Funcionalidade completa sen conexión (os mapas vectoriais ou de teselas baixados almacénanse no cartafol que se escolla)
-\n
-\n
 \n  - Mapas vectoriais compactos sen conexión para todo o mundo
-\n
-\n
-\n  - Pódense baixar mapas de países ou rexións de xeito directo dende a aplicación
-\n
-\n
-\n  - É posíbel sobrepór varias capas de mapas, coma pistas de GPX ou de navegación, puntos de interese (PDI), favoritos, curvas do nivel, paraxes de transporte público ou mapas adicionais con transparencia regulábel.
-\n
-\n
+\n  - Pódense baixar mapas de países ou rexións de xeito directo dende a aplicación 
+\n  - É posíbel sobrepor varias capas de mapas, coma pistas de GPX ou de navegación, puntos de interese (PDI), favoritos, curvas do nivel, paraxes de transporte público ou mapas adicionais con transparencia regulábel
 \n  - Procura sen conexión dos enderezos e lugares (PDI)
-\n
-\n
-\n  - Cálculo de rotas sen conexión para distancias curtas (experimental)
-\n
-\n
+\n  - Cálculo de rotas sen conexión para distancias curtas (experimental) 
 \n  - Modos para automóbil, bicicleta e peóns, con:
-\n
-\n
-\n  - Vistas de día e noite automatizadas opcionais
-\n
-\n
-\n  - Achegamento opcional do mapa dependendo da velocidade
-\n
-\n
-\n  - Aliñamento opcional do mapa dependendo do compás ou da dirección do movemento
-\n
-\n
+\n  - Vistas de día e noite automatizadas opcionais 
+\n  - Achegamento opcional do mapa dependendo da velocidade 
+\n  - Aliñamento opcional do mapa dependendo do compás ou da dirección do movemento 
 \n  - Guía opcional de faixas ou carrís da estrada, límites de velocidade, voces gravadas e TTS
 \n
-\n
-\n
-\n
 \n Limitacións desta versión de balde do OsmAnd:
-\n
-\n
 \n  - O número de mapas a baixar está limitado
-\n
-\n
 \n  - Non hai acceso ós puntos de interese (PDI) da Wikipedia sen conexión
 \n
-\n
-\n
-\n
-\n O OsmAnd está a ser desenvolvido activamente e o noso proxecto e o seu progreso futuro depende da contribución financeira para financia-lo desenvolvemento e as probas das funcionalidades novas. Coida a posibilidade de merca-lo OsmAnd+ ou de financiar funcións novas específicas ou de facer unha doazón xeral no osmand.net."</string>
+\n O OsmAnd está a ser desenvolvido activamente e o noso proxecto e o seu progreso futuro depende da contribución financeira para financia-lo desenvolvemento e as probas das funcionalidades novas. Coida a posibilidade de mercar o OsmAnd+ ou de financiar funcións novas específicas ou de facer unha doazón xeral no osmand.net."</string>
     <string name="osmand_plus_play_title_30_chars">Mapas e navegación de OsmAnd+</string>
     <string name="osmand_plus_short_description_80_chars">Visualización e navegación móbil de mapas globais para mapas de OSM con e sen conexión</string>
     <string name="osmand_plus_long_description_1000_chars">O OsmAnd+ (Indicacións da navegación automatizadas do OSM) é un aplicativo de navegación de código aberto con acceso a unha ampla variedade de datos globais do OSM. Tódolos mapas dos datos (mapas vectoriais ou teselas) poden seren almacenados no cartón de memoria do teléfono para empregalos sen conexión. O OsmAnd tamén fornece funcionalidade de cálculo de rotas sen conexión, incluíndo a guía por voz paso a paso. 
 \n 
-\nO OsmAnd+ é a versión de pagamento, mais ó mercala estás a apoia-lo proxecto, financia-lo desenvolvemento de funcións novas e tes a oportunidade de recibi-las últimas actualizacións. 
+\nO OsmAnd+ é a versión de pagamento, mais ó mercala estás a apoiar o proxecto, financiar o desenvolvemento de funcións novas e tes a oportunidade de recibir as últimas actualizacións. 
 \n 
 \nAlgunhas das funcións principais son: 
 \n-Funcionalidade completa sen conexión (os mapas vectoriais ou de teselas baixados almacénanse no cartafol que se escolleu) 
@@ -595,7 +557,7 @@
     <string name="day_night_info">Información sobre o día e a noite</string>
     <string name="map_widget_vector_attributes">Atributos de renderizado</string>
     <string name="map_widget_renderer">Estilo do mapa</string>
-    <string name="layer_map_appearance">Configura-la pantalla</string>
+    <string name="layer_map_appearance">Configurar a pantalla</string>
     <string name="show_lanes">Faixas ou carrís</string>
     <string name="avoid_unpaved">Non hai estradas sen pavimentar</string>
     <string name="avoid_ferries">Sen ferris</string>
@@ -611,7 +573,7 @@
     <string name="int_continuosly">Continuo</string>
     <string name="screen_is_locked">Premer a icona do cadeado para desbloquear</string>
     <string name="map_widget_top_text">Nome da rúa</string>
-    <string name="map_widget_config">Configura-la pantalla</string>
+    <string name="map_widget_config">Configurar a pantalla</string>
     <string name="map_widget_back_to_loc">Onde estou</string>
     <string name="map_widget_lock_screen">Bloquear</string>
     <string name="map_widget_compass">Compás</string>
@@ -645,13 +607,13 @@
 \nMemoria proporcional %4$s MB (O límite do Android é %5$s MB, Dalvik %6$s MB).</string>
     <string name="native_app_allocated_memory">Memoria nativa total</string>
     <string name="starting_point_too_far">Punto de partida moi lonxe da estrada máis próxima.</string>
-    <string name="shared_location">Localización partillada ou compartida</string>
-    <string name="osmand_parking_event">Recolle-lo automóbil de onde está aparcado</string>
+    <string name="shared_location">Localización compartida</string>
+    <string name="osmand_parking_event">Recoller o automóbil de onde está aparcado</string>
     <string name="osmand_parking_warning">Aviso</string>
     <string name="osmand_parking_warning_text">Engadiuse ó calendario unha notificación para recoller o automóbil e pode ser editada ou eliminada dende alí.</string>
-    <string name="osmand_parking_time_limit_title">Estabelece-lo tempo límite do aparcamento</string>
-    <string name="osmand_parking_delete_confirm">Elimina-la posición do aparcamento\?</string>
-    <string name="osmand_parking_delete">Elimina-la marcaxe de aparcamento</string>
+    <string name="osmand_parking_time_limit_title">Estabelecer o tempo límite do aparcamento</string>
+    <string name="osmand_parking_delete_confirm">Eliminar a posición de aparcamento\?</string>
+    <string name="osmand_parking_delete">Eliminar a marcaxe de aparcamento</string>
     <string name="osmand_parking_choose_type">Escoller o tipo de aparcamento</string>
     <string name="osmand_parking_lim_text">Tempo limitado</string>
     <string name="osmand_parking_no_lim_text">Tempo ilimitado</string>
@@ -659,7 +621,7 @@
     <string name="osmand_parking_time_limit">Aparcamento de tempo limitado</string>
     <string name="osmand_parking_time_no_limit">Aparcamento de tempo ilimitado</string>
     <string name="osmand_parking_position_description">A posición do automóbil aparcado. %1$s</string>
-    <string name="osmand_parking_position_description_add">Recolle-lo automóbil ás:</string>
+    <string name="osmand_parking_position_description_add">Recoller o automóbil ás:</string>
     <string name="osmand_parking_pm">PM</string>
     <string name="osmand_parking_am">AM</string>
     <string name="osmand_parking_position_name">Posición do aparcamento</string>
@@ -673,8 +635,8 @@
     <string name="gpxup_trackable">Seguíbel</string>
     <string name="gpxup_private">Privado</string>
     <string name="asap">O antes posíbel</string>
-    <string name="share_route_as_gpx">Partillar ou comparti-la rota coma ficheiro GPX</string>
-    <string name="share_route_subject">Rota partillada ou compartida mediante o OsmAnd</string>
+    <string name="share_route_as_gpx">Compartir a ruta coma ficheiro GPX</string>
+    <string name="share_route_subject">Ruta compartida por OsmAnd</string>
     <string name="route_roundabout">Rotonda: Tome a %1$dª saída cara</string>
     <string name="route_kl">Mantéñase á esquerda e continúe</string>
     <string name="route_kr">Mantéñase á dereita e continúe</string>
@@ -708,7 +670,7 @@
     <string name="index_settings_descr">Baixar e xestionar mapas sen conexión almacenados no dispositivo.</string>
     <string name="map_online_plugin_is_not_installed">Activar o plugin dos mapas con conexión para escolleres fontes de mapas diferentes</string>
     <string name="map_online_data">Mapas con conexión e en teselas</string>
-    <string name="map_online_data_descr">Empregar mapas con conexión (baixar e garda-las teselas no cartón SD).</string>
+    <string name="map_online_data_descr">Empregar mapas con conexión (baixar e gardar as teselas no cartón SD).</string>
     <string name="shared_string_online_maps">Mapas con conexión</string>
     <string name="online_map_settings_descr">Escoller as fontes de teselas de mapas en liña ou na caché.</string>
     <string name="osmand_rastermaps_plugin_description">Accede a tantos tipos de mapas en liña (chamados teselas, tiles ou ráster) que desexes, dende teselas predefinidas do OSM (coma o Mapnik) a imaxes satelitais e capas de propósito especial coma mapas do tempo, mapas do clima, mapas xeolóxicos, capas de asombreado, etc. 
@@ -785,8 +747,8 @@
     <string name="auto_announce_on">Iniciar os anuncios automáticos</string>
     <string name="auto_announce_off">Deter os anuncios automáticos</string>
     <string name="i_am_here">Estou aquí</string>
-    <string name="zoom_by_trackball_descr">Muda-lo achegamento do mapa a través dos movementos horizontais da roda de desprazamento.</string>
-    <string name="zoom_by_trackball">Emprega-la roda de desprazamento para controla-lo achegamento</string>
+    <string name="zoom_by_trackball_descr">Mudar o achegamento do mapa a través dos movementos horizontais da roda de desprazamento.</string>
+    <string name="zoom_by_trackball">Empregar a roda de desprazamento para controlar o achegamento</string>
     <string name="accessibility_preferences_descr">Preferencias ligadas ca accesibilidade.</string>
     <string name="shared_string_accessibility">Accesibilidade</string>
     <string name="arrival_distance_factor_early">Cedo</string>
@@ -795,9 +757,9 @@
     <string name="arrival_distance_factor_at_last">Nos derradeiros metros</string>
     <string name="arrival_distance">Anuncio da chegada</string>
     <string name="arrival_distance_descr">Cando desexa o anuncio da chegada\?</string>
-    <string name="rendering_out_of_memory">Non abonda a memoria do procesamento para amosa-la área escollida</string>
+    <string name="rendering_out_of_memory">Non abonda a memoria do procesamento para amosar a área escollida</string>
     <string name="use_fluorescent_overlays">Sobreposicións fluorescentes</string>
-    <string name="use_fluorescent_overlays_descr">Empregar cores fluorescentes para amosa-las pistas e rotas.</string>
+    <string name="use_fluorescent_overlays_descr">Empregar cores fluorescentes para amosar as pistas e rutas.</string>
     <string name="offline_edition">Edición sen conexión</string>
     <string name="offline_edition_descr">Empregar sempre a edición sen conexión.</string>
     <string name="update_poi_does_not_change_indexes">As modificacións nos puntos de interese (PDI) dentro da aplicación non afectan ós ficheiros dos mapas baixados, pois esas modificacións gárdanse coma un ficheiro no teu dispositivo.</string>
@@ -813,7 +775,7 @@
     <string name="live_monitoring_interval">Intre de seguemento con conexión</string>
     <string name="live_monitoring_url_descr">Indique o enderezo web con esta sintaxe dos parámetros: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
     <string name="live_monitoring_url">Enderezo web para o seguimento con conexión</string>
-    <string name="gpx_monitoring_disabled_warn">Rexistre a pista empregando o trebello de GPX ou mediante as opcións de «Gravación de viaxe».</string>
+    <string name="gpx_monitoring_disabled_warn">Rexistra a pista empregando o trebello de GPX ou mediante as opcións de \"Gravación de viaxe\".</string>
     <string name="show_current_gpx_title">Amosar pista actual</string>
     <string name="free_version_message">Podes baixar ou actualizar %1$s mapas.</string>
     <string name="free_version_title">Versión libre</string>
@@ -881,10 +843,10 @@
     <string name="poi_query_by_name_matches_categories">Atopadas varias categorías de PDI relacionadas.</string>
     <string name="data_to_search_poi_not_available">Baixar datos sen conexión para procurar PDI.</string>
     <string name="poi_filter_by_name">Procurar polo nome</string>
-    <string name="old_poi_file_should_be_deleted">O ficheiro de datos do PDI «%1$s» é redundante e pode ser eliminado.</string>
+    <string name="old_poi_file_should_be_deleted">O ficheiro de datos do PDI \"%1$s\" é redundante e pode ser eliminado.</string>
     <string name="update_poi_file_not_found">Non foi posíbel atopar un ficheiro local para manter as modificacións nos PDI e tampouco foi posíbel crealo.</string>
     <string name="button_upgrade_osmandplus">Actualizar OsmAnd+</string>
-    <string name="map_version_changed_info">Baixa a nova versión da aplicación, para poder emprega-los novos ficheiros dos mapas.</string>
+    <string name="map_version_changed_info">Baixa a nova versión da aplicación, para poder empregar os novos ficheiros dos mapas.</string>
     <string name="shared_string_rename">Mudar o nome</string>
     <string name="poi_filter_nominatim">Nominatim con conexión</string>
     <string name="search_position_current_location_search">Estase a procurar a posición…</string>
@@ -895,12 +857,12 @@
     <string name="search_position_map_view">Centro do mapa actual</string>
     <string name="select_search_position">Orixe:</string>
     <string name="context_menu_item_search">Procurar preto daquí</string>
-    <string name="shared_string_save_as_gpx">Garda-la rota coma pista do GPX</string>
+    <string name="shared_string_save_as_gpx">Gardar coma novo ficheiro GPX</string>
     <string name="route_successfully_saved_at">A rota foi gardada coma \"%1$s\".</string>
     <string name="filename_input">Nome do ficheiro:</string>
     <string name="file_with_name_already_exist">Xa existe un ficheiro co mesmo nome.</string>
     <string name="shared_string_save">Gardar</string>
-    <string name="local_index_upload_gpx_description">Subi-los ficheiros do GPX á comunidade do OSM, mellorando os mapas.</string>
+    <string name="local_index_upload_gpx_description">Subir os ficheiros do GPX á comunidade do OSM, mellorando os mapas.</string>
     <string name="local_index_items_uploaded">Foron enviados %1$d de %2$d elemento(s).</string>
     <string name="local_index_mi_upload_gpx">Enviar a OSM</string>
     <string name="show_more_map_detail">Amosar máis detalles dos mapas</string>
@@ -914,14 +876,14 @@
     <string name="favourites_edit_dialog_category">Categoría</string>
     <string name="shared_string_no_thanks">Non, grazas</string>
     <string name="basemap_missing">Baixa o mapa base mundial para una ollada xeral global nos achegamentos pequenos.</string>
-    <string name="vector_data_missing">Baixa os datos («sen conexión») para emprega-los mapas sen conexión.</string>
+    <string name="vector_data_missing">Baixa os datos (\"sen conexión\") para empregar os mapas sen conexión.</string>
     <string name="local_index_installed">Versión local</string>
     <string name="local_index_items_backuped">%1$d elemento(s) de %2$d foron desactivados.</string>
     <string name="local_index_items_deleted">%1$d elemento(s) de %2$d foron eliminados.</string>
     <string name="local_index_items_restored">%1$d elemento(s) de %2$d foron activados.</string>
     <string name="local_index_no_items_to_do">Non hai elementos para %1$s</string>
     <string name="local_index_action_do">Está a piques de %1$s %2$s elemento(s). Continuar?</string>
-    <string name="local_index_descr_title">Xestiona-los ficheiros dos mapas.</string>
+    <string name="local_index_descr_title">Xestionar os ficheiros dos mapas.</string>
     <string name="local_index_mi_restore">Activar</string>
     <string name="local_index_mi_backup">Desactivar</string>
     <string name="shared_string_download">Baixar</string>
@@ -944,13 +906,13 @@
     <string name="tts_language_not_supported_title">Esta lingua non está dispoñíbel</string>
     <string name="tts_language_not_supported">A lingua escollida é incompatíbel co motor TTS (texto lido a voz) instalado no Android, empregarase a lingua TTS predefinida. Procurar outro motor TTS na tenda de aplicacións\?</string>
     <string name="tts_missing_language_data_title">faltan datos</string>
-    <string name="tts_missing_language_data">Ir á tenda de aplicacións para baixa-la lingua elixida\?</string>
-    <string name="gpx_option_reverse_route">Inverte-la dirección do GPX</string>
+    <string name="tts_missing_language_data">Ir á tenda de aplicacións para baixar a lingua escollida\?</string>
+    <string name="gpx_option_reverse_route">Inverter a dirección do GPX</string>
     <string name="gpx_option_destination_point">Empregar o destino actual</string>
     <string name="gpx_option_from_start_point">Percorrer toda a pista</string>
-    <string name="switch_to_vector_map_to_see">Hai un mapa vectorial sen conexión para este sitio.
-\n\t
-\n\tPara empregalo active «Menú» → «Configura-lo mapa» → «Fonte dos mapas…» → «Mapas vectoriais sen conexión».</string>
+    <string name="switch_to_vector_map_to_see">Hai un mapa vectorial sen conexión para este sitio. 
+\n\t 
+\n\tPara empregalo activa o \"Menú\" → \"Configurar o mapa\" → \"Fonte dos mapas…\" → \"Mapas vectoriais sen conexión\".</string>
     <string name="choose_audio_stream">Saída das indicacións por voz</string>
     <string name="choose_audio_stream_descr">Escolle que altofalante reproducirá as indicacións por voz.</string>
     <string name="voice_stream_voice_call">Son de chamada telefónica (para os altavoces estéreos con Bluetooth)</string>
@@ -968,7 +930,7 @@
     <string name="shared_string_none">Ningún</string>
     <string name="map_overlay">Mapa sobreposto</string>
     <string name="map_overlay_descr">Escoller mapa da sobreposición</string>
-    <string name="tile_source_already_installed">O mapa xa está instalado; vanse actualiza-los \"Axustes\".</string>
+    <string name="tile_source_already_installed">O mapa xa está instalado; vanse actualizar os \"Axustes\".</string>
     <string name="select_tile_source_to_install">Escolle os mapas (teselas) para instalar ou actualizar.</string>
     <string name="internet_not_available">Esta operación precisa dunha conexión á Internet.</string>
     <string name="install_more">Instalar máis…</string>
@@ -976,7 +938,7 @@
     <string name="level_to_switch_vector_raster">Nivel do achegamento vectorial mínimo</string>
     <string name="create_poi_link_to_osm_doc">
         <u>OSM en liña</u> clasificación de mapa con imaxes.</string>
-    <string name="error_doing_search">Non se puido face-la procura sen conexión.</string>
+    <string name="error_doing_search">Non se puido facer a procura sen conexión.</string>
     <string name="search_osm_offline">Procurar localización xeográfica</string>
     <string name="system_locale">Sistema</string>
     <string name="preferred_locale_descr">Lingua da aplicación (empregada após reiniciar o OsmAnd).</string>
@@ -993,12 +955,12 @@
     <string name="foot">pés</string>
     <string name="mile_per_hour">mi/h</string>
     <string name="mile">mi</string>
-    <string name="send_location_way_choose_title">Partillar ou comparti-la localización empregando</string>
+    <string name="send_location_way_choose_title">Compartir a localización empregando</string>
     <string name="send_location_sms_pattern">Localización: %1$s
 \n%2$s</string>
-    <string name="send_location_email_pattern">Para ollar a localización segue a ligazón do navigador web %1$s ou a ligazón do Android %2$s</string>
-    <string name="send_location">Envia-la localización</string>
-    <string name="context_menu_item_share_location">Partillar ou comparti-la localización</string>
+    <string name="send_location_email_pattern">Para ollar a localización segue a ligazón do navegador web %1$s ou a ligazón do Android %2$s</string>
+    <string name="send_location">Enviar a localización</string>
+    <string name="context_menu_item_share_location">Compartir a localización</string>
     <string name="add_waypoint_dialog_added">Punto de pasaxe GPX \"{0}\" engadido</string>
     <string name="add_waypoint_dialog_title">Engadir punto de pasaxe á pista GPX gravada</string>
     <string name="context_menu_item_add_waypoint">Engadir punto de pasaxe do GPX</string>
@@ -1036,8 +998,8 @@
     <string name="poi_filter_custom_filter">Filtro personalizado</string>
     <string name="poi_filter_namefinder">NameFinder en liña</string>
     <string name="reading_cached_tiles">A ler as teselas gardadas temporalmente…</string>
-    <string name="version_index_is_big_for_memory">O índice «{0}» non cabe na memoria</string>
-    <string name="version_index_is_not_supported">Non se admite a versión do índice «{0}»</string>
+    <string name="version_index_is_big_for_memory">O índice \"{0}\" non cabe na memoria</string>
+    <string name="version_index_is_not_supported">Non se admite a versión do índice \"{0}\"</string>
     <string name="osmand_routing_experimental">A navegación sen conexión de OsmAnd é unha funcionalidade experimental e non funciona para distancias maiores duns 20 km.
 \n
 \nO servizo de navegación vai pasar temporalmente ó CloudMade, con conexión.</string>
@@ -1045,8 +1007,8 @@
     <string name="application_dir">Cartafol de almacenamento dos datos</string>
     <string name="osmand_net_previously_installed">Tódolos datos sen conexión na versión vella do OsmAnd son compatíbeis ca nova versión, pero os puntos dos Favoritos deben exportarse dende a versión viella e despois, importarse na nova.</string>
     <string name="build_installed">A compilación {0} foi instalada ({1}).</string>
-    <string name="downloading_build">Estase a baixa-la compilación…</string>
-    <string name="install_selected_build">Instala-lo OsmAnd - {0} de {1} {2} MB\?</string>
+    <string name="downloading_build">Estase a baixar a compilación…</string>
+    <string name="install_selected_build">Instalar o OsmAnd - {0} de {1} {2} MB\?</string>
     <string name="loading_builds_failed">Fallou a obtención da listaxe das compilacións do OsmAnd</string>
     <string name="loading_builds">A cargar as compilacións de OsmAnd…</string>
     <string name="select_build_to_install">Escoller unha compilación do OsmAnd para instalar</string>
@@ -1065,7 +1027,7 @@
     <string name="shared_string_select_all">Selecciónao todo</string>
     <string name="shared_string_refresh">Anovar</string>
     <string name="fast_route_mode">Rota máis rápida</string>
-    <string name="fast_route_mode_descr">Active isto para calcula-la rota máis rápida ou desactíveo para a máis eficiencia no combustíbel.</string>
+    <string name="fast_route_mode_descr">Activa isto para calcular a ruta máis rápida ou desactívao para a máis eficiencia no combustíbel.</string>
     <string name="tiles_to_download_estimated_size">No achegamento {0}, baixar {1} teselas ({2} MB)</string>
     <string name="shared_string_download_map">Baixar mapa</string>
     <string name="select_max_zoom_preload_area">Achegamento máximo para precargar</string>
@@ -1086,7 +1048,7 @@
     <string name="context_menu_item_search_transport">Procurar transporte público</string>
     <string name="transport_searching_transport">Resultados de transporte (sen destino):</string>
     <string name="transport_searching_route">Resultados de transporte ({0} ao destino):</string>
-    <string name="transport_search_again">Restaura-la procura do transporte</string>
+    <string name="transport_search_again">Restabelecer a procura de transporte</string>
     <string name="voice">Voz gravada</string>
     <string name="no_vector_map_loaded">Os mapas vectoriais non están cargados</string>
     <string name="gpx_files_not_found">Non foi posíbel atopar ficheiros GPX no cartafol de pistas</string>
@@ -1103,12 +1065,12 @@
     <string name="rotate_map_to_bearing">Orientación do mapa</string>
     <string name="show_route">Detalles do itinerario</string>
     <string name="fav_imported_sucessfully">Os Favoritos foron importados</string>
-    <string name="import_file_favourites">Garda-los datos nun ficheiro GPX ou importar puntos de pasaxe ós \"Favoritos\"\?</string>
+    <string name="import_file_favourites">Gardar os datos nun ficheiro GPX ou importar puntos de pasaxe ós \"Favoritos\"\?</string>
     <string name="fav_file_to_load_not_found">O ficheiro GPX dos Favoritos non se atopou en {0}</string>
     <string name="fav_saved_sucessfully">Os Favoritos foron gardados en {0}</string>
     <string name="no_fav_to_save">Non hai puntos dos Favoritos que gardar</string>
     <string name="shared_string_import">Importar</string>
-    <string name="shared_string_share">Compartillar</string>
+    <string name="shared_string_share">Compartir</string>
     <string name="share_fav_subject">Favoritos compartidos mediante OsmAnd</string>
     <string name="error_occurred_loading_gpx">Non foi posíbel cargar o GPX.</string>
     <string name="send_report">Send report</string>
@@ -1124,7 +1086,7 @@
     <string name="layer_map">Fonte dos mapas…</string>
     <string name="menu_layers">Capas do mapa</string>
     <string name="context_menu_item_search_poi">Procurar PDI</string>
-    <string name="use_trackball_descr">Emprega un dispositivo con roda de desprazamento para move-lo mapa.</string>
+    <string name="use_trackball_descr">Emprega un dispositivo con roda de desprazamento para mover o mapa.</string>
     <string name="use_trackball">Empregar a trackball</string>
     <string name="background_service_wait_int_descr">Estabelece o maior tempo de espera permitido para cada corrección da posición en segundo plano.</string>
     <string name="background_service_wait_int">Tempo de espera máximo para posicionamento</string>
@@ -1152,7 +1114,7 @@
     <string name="sd_unmounted">O cartón de memoria non está accesíbel.
 \nNon poderás ollar mapas nin atopar cousas.</string>
     <string name="sd_mounted_ro">O cartón de memoria só pode ser lido. 
-\nAgora só é posíbel olla-lo mapa precargado e non poden baixarse novas áreas.</string>
+\nAgora só é posíbel ollar o mapa precargado e non poden baixarse novas áreas.</string>
     <string name="unzipping_file">A descomprimir o ficheiro…</string>
     <string name="route_tr">Vire á dereita e continúe</string>
     <string name="route_tshr">Vire de xeito forte á dereita e continúe</string>
@@ -1164,7 +1126,7 @@
     <string name="route_head">Diríxase cara</string>
     <string name="first_time_continue">Despois</string>
     <string name="first_time_download">Baixar rexións</string>
-    <string name="search_poi_location">Estase a agarda-lo sinal…</string>
+    <string name="search_poi_location">Estase a agardar o sinal…</string>
     <string name="search_near_map">Procurar preto do centro actual do mapa</string>
     <string name="search_nearby">Procurar preto</string>
     <string name="map_orientation_default">A mesma do dispositivo</string>
@@ -1179,7 +1141,7 @@
     <string name="transport_stops">paraxes</string>
     <string name="transport_search_after">Itinerario posterior</string>
     <string name="transport_search_before">Itinerario anterior</string>
-    <string name="transport_finish_search">Remata-la procura</string>
+    <string name="transport_finish_search">Rematar a procura</string>
     <string name="transport_stop_to_go_out">Escolle a paraxe na que baixar</string>
     <string name="transport_to_go_after">distancia anterior</string>
     <string name="transport_to_go_before">distancia posterior</string>
@@ -1194,9 +1156,9 @@
     <string name="update_poi_error_local">Non podes atualizar a listaxe local de PDI.</string>
     <string name="update_poi_error_loading">Non foi posíbel cargar os datos do servidor.</string>
     <string name="update_poi_no_offline_poi_index">Non hai datos de PDI dispoñíbeis sen conexión para esta zona</string>
-    <string name="update_poi_is_not_available_for_zoom">O achegamento permítelle actualiza-los PDI</string>
+    <string name="update_poi_is_not_available_for_zoom">O achegamento permítelle actualizar os PDI</string>
     <string name="context_menu_item_update_poi">Actualizar os PDI</string>
-    <string name="context_menu_item_update_map_confirm">Actualiza-los datos locais dende a Internet\?</string>
+    <string name="context_menu_item_update_map_confirm">Actualizar os datos locais dende a Internet\?</string>
     <string name="search_history_city">Cidade: {0}</string>
     <string name="search_history_street">Rúa: {0}, {1}</string>
     <string name="search_history_int_streets">Intersección: {0} x {1} in {2}</string>
@@ -1208,7 +1170,7 @@
     <string name="uploading">A actualizar…</string>
     <string name="search_nothing_found">Non se atopou nada</string>
     <string name="searching">Estase a procurar…</string>
-    <string name="searching_address">Estase a procura-lo enderezo…</string>
+    <string name="searching_address">Estase a procurar o enderezo…</string>
     <string name="search_osm_nominatim">Procura en liña empregando o OSM Nominatim</string>
     <string name="hint_search_online">Procura en liña: Número do edificio, rúa, cidade</string>
     <string name="search_offline_address">Procura sen conexión</string>
@@ -1224,7 +1186,7 @@
     <string name="address">Enderezo</string>
     <string name="shared_string_download_successful">Baixouse</string>
     <string name="shared_string_downloading">Estase a baixar…</string>
-    <string name="downloading_list_indexes">Estase a baixa-la listaxe das rexións dispoñíbeis…</string>
+    <string name="downloading_list_indexes">Estase a baixar a listaxe de rexións dispoñíbeis…</string>
     <string name="list_index_files_was_not_loaded">A listaxe das rexións non puido ser obtida dende https://osmand.net.</string>
     <string name="fav_points_edited">Editouse o punto favorito</string>
     <string name="fav_points_not_exist">Non hai ningún punto de Favorito</string>
@@ -1234,13 +1196,13 @@
     <string name="mark_final_location_first">Estabelece o destino primeiro</string>
     <string name="get_directions">Indicacións</string>
     <string name="opening_hours">Horas de apertura</string>
-    <string name="opening_changeset">Abrindo o conxunto de trocos…</string>
-    <string name="closing_changeset">Estase a fecha-lo conxunto de trocos…</string>
+    <string name="opening_changeset">Abrindo o conxunto de modificacións…</string>
+    <string name="closing_changeset">Estase a pechar o conxunto de modificacións…</string>
     <string name="commiting_node">A enviar o nó…</string>
     <string name="loading_poi_obj">A cargar os PDI…</string>
     <string name="auth_failed">Fallou a autorización</string>
     <string name="failed_op">fallou</string>
-    <string name="converting_names">Estase a converte-los nomes locais/ingleses…</string>
+    <string name="converting_names">Estanse a converter os nomes locais/ingleses…</string>
     <string name="loading_streets_buildings">A cargar as rúas/edificios…</string>
     <string name="loading_postcodes">A cargar os códigos postais…</string>
     <string name="loading_streets">A cargar as rúas…</string>
@@ -1260,7 +1222,7 @@
     <string name="previous_run_crashed">O OsmAnd fallou na última execución. O ficheiro de rexistro está en {0}. Informa, se podes, deste problema e achega o ficheiro de rexistro.</string>
     <string name="saving_gpx_tracks">Estase a gardar ficheiro GPX…</string>
     <string name="finished_task">Rematado</string>
-    <string name="use_online_routing_descr">Emprega-la Internet para calcula-la rota.</string>
+    <string name="use_online_routing_descr">Empregar a Internet para calcular a ruta.</string>
     <string name="use_online_routing">Empregar a navegación con conexión</string>
     <string name="osm_settings_descr">Indicar os axustes do OpenStreetMap.org (OSM) precisados para os envíos ó OSM.</string>
     <string name="data_settings_descr">Indica a lingua, baixar/recarregar datos.</string>
@@ -1273,7 +1235,7 @@
     <string name="mark_point">Destino</string>
     <string name="shared_string_add_to_favorites">Engadir ós \"Favoritos\"</string>
     <string name="use_english_names_descr">Escoller entre os nomes na lingua local ou no inglés.</string>
-    <string name="use_english_names">Emprega-los nomes no inglés nos mapas</string>
+    <string name="use_english_names">Empregar os nomes en inglés nos mapas</string>
     <string name="app_settings">Axustes da aplicación</string>
     <string name="search_address">Procurar enderezo</string>
     <string name="choose_building">Escoller o edificio</string>
@@ -1281,14 +1243,14 @@
     <string name="choose_city">Escolle a cidade ou o código postal</string>
     <string name="ChooseCountry">Escoller o país</string>
     <string name="show_view_angle">Amosar dirección da vista</string>
-    <string name="map_view_3d_descr">Activa-la vista 3D do mapa.</string>
+    <string name="map_view_3d_descr">Activar a vista 3D do mapa.</string>
     <string name="map_view_3d">Vista do mapa en 3D</string>
     <string name="show_poi_over_map_description">Amosar a última capa de PDI empregada.</string>
     <string name="show_poi_over_map">Amosar sobreposición dos PDI</string>
     <string name="map_tile_source_descr">Escoller a fonte das teselas de mapas en liña ou na caché.</string>
     <string name="map_tile_source">Fonte das teselas do mapa</string>
     <string name="map_source">Fonte do mapa</string>
-    <string name="use_internet">Emprega-la Internet</string>
+    <string name="use_internet">Empregar a Internet</string>
     <string name="show_location">Amosar a túa posición</string>
     <string name="show_gps_coordinates_text">Amosar coordenadas do GPS no mapa</string>
     <string name="use_internet_to_download_tile">Baixar as teselas do mapa que fallen</string>
@@ -1331,10 +1293,10 @@
     <string name="shared_string_no">Non</string>
     <string name="add_favorite_dialog_top_text">Insire o nome do Favorito</string>
     <string name="add_favorite_dialog_default_favourite_name">Favorito</string>
-    <string name="add_favorite_dialog_favourite_added_template">O punto favorito «{0}» foi engadido.</string>
-    <string name="favourites_context_menu_edit">Edita-lo Favorito</string>
+    <string name="add_favorite_dialog_favourite_added_template">O punto favorito \"{0}\" foi engadido.</string>
+    <string name="favourites_context_menu_edit">Editar o Favorito</string>
     <string name="favourites_context_menu_delete">Eliminar dos Favoritos</string>
-    <string name="favourites_remove_dialog_msg">Elimina-lo punto Favorito \"%s\"\?</string>
+    <string name="favourites_remove_dialog_msg">Eliminar o punto Favorito \"%s\"\?</string>
     <string name="favourites_remove_dialog_success">O punto favorito {0} foi eliminado.</string>
     <string name="osb_author_dialog_password">Contrasinal de OSM (opcional)</string>
     <string name="osb_comment_dialog_message">Mensaxe</string>
@@ -1351,8 +1313,8 @@
     <string name="poi_action_add">engadir</string>
     <string name="poi_action_change">mudar</string>
     <string name="poi_action_succeded_template">A acción {0} foi completada.</string>
-    <string name="poi_error_unexpected_template">Non foi posíbel realiza-la acción {0}.</string>
-    <string name="poi_error_io_error_template">Erro do E/S ó realiza-la acción {0}.</string>
+    <string name="poi_error_unexpected_template">Non foi posíbel realizar a acción {0}.</string>
+    <string name="poi_error_io_error_template">Erro do E/S ó realizar a acción {0}.</string>
     <string name="poi_error_info_not_loaded">A información sobre o nó non foi cargada</string>
     <string name="poi_dialog_opening_hours">Aberto</string>
     <string name="poi_dialog_comment">Comentario</string>
@@ -1388,7 +1350,7 @@
     <string name="map_locale">Lingua do mapa</string>
     <string name="rendering_attr_transportStops_name">Paradas do transporte</string>
     <string name="navigate_point_zone">Zona</string>
-    <string name="download_tab_downloads">Tódalas baixadas</string>
+    <string name="download_tab_downloads">Todas as descargas</string>
     <string name="download_tab_updates">Actualizacións</string>
     <string name="download_tab_local">Local</string>
     <string name="no_internet_connection">Imposíbel de baixar, comproba a conexión á Internet.</string>
@@ -1404,7 +1366,7 @@
     <string name="coordinates">Coordenadas</string>
     <string name="rendering_attr_tramTrainRoutes_name">Liñas dos tranvías e trens</string>
     <string name="lock_screen_request_explanation">%1$s require este permiso para apagar a pantalla para a funcionalidade de aforro de enerxía.</string>
-    <string name="wake_on_voice">Acende-la pantalla</string>
+    <string name="wake_on_voice">Acender a pantalla</string>
     <string name="wake_on_voice_descr">Acende a pantalla do dispositivo (se estiver apagada) ó aproximarse a unha manobra.</string>
     <string name="shared_string_never">Endexamais</string>
     <string name="impassable_road">Evitar estradas…</string>
@@ -1423,7 +1385,7 @@
     <string name="map_widget_right">Panel dereito</string>
     <string name="map_widget_left">Panel esquerdo</string>
     <string name="shared_string_show">Amosar</string>
-    <string name="configure_map">Configura-lo mapa</string>
+    <string name="configure_map">Configurar o mapa</string>
     <string name="search_radius_proximity">A menos dos</string>
     <string name="anonymous_user_hint">Os usuarios anónimos non poden: 
 \n - Facer grupos; 
@@ -1498,7 +1460,7 @@
     <string name="archive_wikipedia_data">Ten datos vellos da Wikipedia, que son incompatíbeis. Desexa arquivalos\?</string>
     <string name="download_wikipedia_files">Baixar datos adicionais da Wikipedia (%1$s MB)\?</string>
     <string name="gps_network_not_enabled">O servizo de localización está desactivado. Desexas activalo\?</string>
-    <string name="disable_recording_once_app_killed">Evita-lo rexistro autónomo</string>
+    <string name="disable_recording_once_app_killed">Evitar o rexistro autónomo</string>
     <string name="shared_string_import2osmand">Importar ó OsmAnd</string>
     <string name="read_full_article">Ler o artigo completo (na rede)</string>
     <string name="local_indexes_cat_wiki">Wikipedia</string>
@@ -1524,7 +1486,7 @@
     <string name="shared_string_search">Procurar</string>
     <string name="shared_string_show_description">Amosar descrición.</string>
     <string name="shared_string_message">Mensaxe</string>
-    <string name="confirm_usage_speed_cameras">En moitos países (Alemaña, Francia, Italia e outros) a lei non permite o emprego de avisos de radares de velocidade. O OsmAnd non asume ningunha responsabilidade se ti violas a lei. Preme en «Si», só se podes empregar esta funcionalidade.</string>
+    <string name="confirm_usage_speed_cameras">En moitos países (Alemaña, Francia, Italia e outros) a lei non permite o emprego de avisos de radares de velocidade. O OsmAnd non asume ningunha responsabilidade se ti violas a lei. Preme en \"Si\", só se podes empregar esta funcionalidade.</string>
     <string name="welmode_download_maps">Baixar mapas</string>
     <string name="welcome_select_region">Para reflectir de xeito correcto os seus sinais de tráfico e as normas, indica a rexión pola que conduces:</string>
     <string name="welcome_text">O OsmAnd fornece mapas globais sen conexión e navegación global sen conexión.</string>
@@ -1533,7 +1495,7 @@
     <string name="mark_to_delete">Marcar para eliminar</string>
     <string name="local_recordings_delete_all_confirm">Eliminar %1$d notas\?</string>
     <string name="local_osm_changes_upload_all_confirm">Subir %1$d modificación(s) ó OSM\?</string>
-    <string name="confirmation_to_clear_history">Limpa-lo historial\?</string>
+    <string name="confirmation_to_clear_history">Limpar o historial\?</string>
     <string name="shared_string_go">Ir</string>
     <string name="osm_edits">Edicións do OSM</string>
     <string name="osmand_parking_hour">h</string>
@@ -1565,7 +1527,7 @@ Lon %2$s</string>
     <string name="track_points">Puntos de pista</string>
     <string name="plugin_ski_name">Vista dos mapas de esquí</string>
     <string name="back_to_map">Volver ao mapa</string>
-    <string name="share_note">Partillar ou compartir nota</string>
+    <string name="share_note">Compartir nota</string>
     <string name="location_on_map">Localización:
 \n Lat %1$s
 \n Lon %2$s</string>
@@ -1584,12 +1546,12 @@ Lon %2$s</string>
     <string name="settings_privacy">Privacidade</string>
     <string name="shared_string_gpx_points">Puntos</string>
     <string name="navigation_over_track">Comezar a navegación ó longo da pista\?</string>
-    <string name="avoid_roads_msg">Obter unha rota alternativa elixindo as estradas que desexe evitar</string>
+    <string name="avoid_roads_msg">Obter unha ruta alternativa escollendo as estradas que desexes evitar</string>
     <string name="rendering_value__name">Predeterminado</string>
     <string name="rendering_value_highContrastRoads_name">Estradas con contraste alto</string>
     <string name="traffic_warning_railways">Cruzamento ferroviario</string>
     <string name="show_railway_warnings">Cruzamentos ferroviarios</string>
-    <string name="enable_proxy_title">Activa-lo proxy do HTTP</string>
+    <string name="enable_proxy_title">Activar o proxy do HTTP</string>
     <string name="enable_proxy_descr">Configurar un proxy do HTTP para tódalas solicitudes de rede.</string>
     <string name="proxy_host_title">Máquina do proxy</string>
     <string name="proxy_host_descr">Especifica o nome do teu proxy (p.ex. 127.0.0.1).</string>
@@ -1626,8 +1588,8 @@ Lon %2$s</string>
     <string name="contact_info">información de contacto</string>
     <string name="poi_dialog_poi_type">Tipo do PDI</string>
     <string name="please_specify_poi_type">Indica o tipo de PDI.</string>
-    <string name="shared_string_deselect">Desbota-la selección</string>
-    <string name="shared_string_deselect_all">Desbota-la selección toda</string>
+    <string name="shared_string_deselect">Desbotar a selección</string>
+    <string name="shared_string_deselect_all">Deseleccionar todo</string>
     <string name="osm_edit_context_menu_delete">Eliminar edición do OSM</string>
     <string name="rendering_attr_OSMMapperAssistant_name">Axudante cartográfico do OSM</string>
     <string name="osm_changes_added_to_local_edits">As modificacións no OSM foron engadidas ó conxunto de modificacións local</string>
@@ -1665,7 +1627,7 @@ Lon %2$s</string>
     <string name="disable_recording_once_app_killed_descrp">Detén o rexistro de GPX cando se pecha a aplicación (mediante a lapela de aplicacións recentes). (A indicación do OsmAnd desaparece da barra das notificacións do Android.)</string>
     <string name="agps_info">Información de A-GPS</string>
     <string name="agps_data_last_downloaded">Datos A-GPS baixados: %1$s</string>
-    <string name="delay_to_start_navigation_descr">Indica-lo tempo de agarda durante o que ficar na pantalla de planificación das rotas.</string>
+    <string name="delay_to_start_navigation_descr">Indicar o tempo de espera durante o que ficar na pantalla de planificación das rutas.</string>
     <string name="delay_to_start_navigation">Comezar a guía paso a paso após…</string>
     <string name="parking_place_limited">Tempo de aparcamento limitado a</string>
     <string name="plugin_nautical_name">Vista do mapa náutico</string>
@@ -1705,7 +1667,7 @@ Lon %2$s</string>
     <string name="map_downloaded">Mapa baixado</string>
     <string name="map_downloaded_descr">O mapa de %1$s está disposto para empregarse.</string>
     <string name="go_to_map">Amosar mapa</string>
-    <string name="share_menu_location">Partillar ou comparti-la localización</string>
+    <string name="share_menu_location">Compartir a localización</string>
     <string name="min_mile">min/mi</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/seg</string>
@@ -1713,9 +1675,9 @@ Lon %2$s</string>
     <string name="routing_attr_avoid_shuttle_train_name">Sen tranbordos de tren</string>
     <string name="routing_attr_avoid_shuttle_train_description">Evitar transbordos de tren</string>
     <string name="shared_string_wikipedia">Wikipedia</string>
-    <string name="shared_string_currently_recording_track">Estase a grava-la pista neste intre</string>
+    <string name="shared_string_currently_recording_track">Estase a gravar a pista neste intre</string>
     <string name="favourites_context_menu_add">Engadir ós Favorito</string>
-    <string name="dahboard_options_dialog_title">Configura-lo taboleiro de control</string>
+    <string name="dahboard_options_dialog_title">Configurar o taboleiro de control</string>
     <string name="show_on_start">Amosar no inicio</string>
     <string name="commit_poi">Enviar o PDI</string>
     <string name="saved_at_time">Gardado agora coma: %1$s</string>
@@ -1724,28 +1686,28 @@ Lon %2$s</string>
     <string name="count_of_lines">Número de liñas</string>
     <string name="are_you_sure">Tes a certeza de querer facelo\?</string>
     <string name="unsaved_changes_will_be_lost">Vanse perder as modificacións non gardadas. Proseguer\?</string>
-    <string name="downloads_left_template">Faltan %1$s baixadas</string>
+    <string name="downloads_left_template">Faltan %1$s descargas</string>
     <string name="roads">Estradas</string>
     <string name="downloading_number_of_files">Estase a baixar - ficheiro %1$d</string>
     <string name="buy">Mercar</string>
     <string name="activate_srtm_plugin">Activa o plugin das \"Curvas de nivel\"</string>
     <string name="later">Noutro intre</string>
     <string name="get_full_version">Versión completa</string>
-    <string name="downloads">Baixadas</string>
+    <string name="downloads">Descargas</string>
     <string name="confirm_download_roadmaps">O mapa de só estradas non é preciso, xa que ten o mapa estándar (completo). Desexas baixalo de todos xeitos\?</string>
     <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualizar todo (%1$s MB)</string>
-    <string name="free_downloads_used">Baixadas de balde empregadas</string>
-    <string name="application_dir_description">Escolle onde desexas garda-los mapas e outros ficheiros de datos.</string>
+    <string name="free_downloads_used">Descargas de balde empregadas</string>
+    <string name="application_dir_description">Escolle onde desexas gardar os mapas e outros ficheiros de datos.</string>
     <string name="enter_country_name">Insira o nome do país</string>
     <string name="new_version">Versión nova</string>
     <string name="begin_with_osmand_menu_group">Primeiros pasos co OsmAnd</string>
     <string name="features_menu_group">Funcionalidades</string>
-    <string name="help_us_to_improve_menu_group">Axudar a mellora-lo OsmAnd</string>
+    <string name="help_us_to_improve_menu_group">Axudar a mellorar o OsmAnd</string>
     <string name="plugins_menu_group">Plugins</string>
     <string name="first_usage_item">Primeiro emprego</string>
-    <string name="first_usage_item_description">De que xeito baixar mapas e axusta-las opcións básicas.</string>
+    <string name="first_usage_item_description">De que xeito baixar mapas e axustar as opcións básicas.</string>
     <string name="navigation_item_description">Axustes da navegación.</string>
     <string name="planning_trip_item">Planificación dunha viaxe</string>
     <string name="faq_item">Cuestións frecuentes (FAQ)</string>
@@ -1761,7 +1723,7 @@ Lon %2$s</string>
     <string name="hillshade_layer_disabled">A capa de curvas de nivel está desactivada</string>
     <string name="av_locations_descr">Ficheiro GPX con localizacións.</string>
     <string name="plugin_touringview_name">Vista de mapa turístico</string>
-    <string name="plugin_touringview_descr">Ó activares esta vista múdase o estilo do mapa do OsmAnd cara a «Vista turística», que é unha vista especial moi detallada para viaxeiros e condutores profesionais. 
+    <string name="plugin_touringview_descr">Ó activares esta vista múdase o estilo do mapa do OsmAnd cara a \"Vista turística\", que é unha vista especial moi detallada para viaxeiros e condutores profesionais. 
 \n 
 \nEsta vista fornece, en tódolos achegamentos do mapa, o nivel máximo de detalles de viaxe dispoñíbeis cos datos do mapa (en concreto, estradas, pistas, camiños e marcaxes de orientación). 
 \n 
@@ -1771,12 +1733,12 @@ Lon %2$s</string>
 \n 
 \nNon se precisa baixar ningún mapa especial, xa que a vista se xera a partir dos mapas normais. 
 \n 
-\nPódese pechar esta vista desactivándoa eiquí ou mudando o «Estilo do mapa» en «Configurar o mapa» coma se desexe.</string>
+\nPódese pechar esta vista desactivándoa aquí ou mudando o \"Estilo do mapa\" en \"Configurar o mapa\" coma se desexe.</string>
     <string name="plugin_nautical_descr">Este plugin enriquece a aplicación de mapas de navegación OsmAnd para que amose tamén mapas náuticos para viaxes en barco e outros tipos de deportes acuáticos. 
 \n 
 \nUnha extensión dos mapas especial para o OsmAnd fornece tódalas marcaxes náuticas e símbolos das cartas para a navegación en augas interiores e de cabotaxe. A descrición de cada marcaxe da navegación fornece os detalles precisos para identificala, así coma o seu significado (categoría, forma, cor, secuencia, referencia, etc.). 
 \n 
-\nPara voltar a un dos estilos do mapa convencionais do OsmAnd, sinxelamente hai que desactivar este plugin de novo ou mudar o «Estilo do mapa» en «Configurar o mapa» coma se desexe.</string>
+\nPara voltar a un dos estilos do mapa convencionais do OsmAnd, sinxelamente hai que desactivar este plugin de novo ou mudar o \"Estilo do mapa\" en \"Configurar o mapa\" coma se desexe.</string>
     <string name="impassable_road_desc">Escolle as estradas que desexes evitar durante a navegación.</string>
     <string name="shared_string_sound">Son</string>
     <string name="no_location_permission">Outorgar acceso ós datos de localización.</string>
@@ -1830,7 +1792,7 @@ Lon %2$s</string>
     <string name="lang_mk">Macedonio</string>
     <string name="world_map_download_descr">O mapa base mundial (abrangue todo o mundo en achegamentos pequenos), falla ou está desactualizado. Coida baixalo para unha ollada xeral.</string>
     <string name="simulate_initial_startup">Simular o primeiro inicio da aplicación</string>
-    <string name="looking_up_address">Estase a procura-lo enderezo</string>
+    <string name="looking_up_address">Estase a procurar o enderezo</string>
     <string name="rendering_attr_currentTrackColor_description">Cor de GPX</string>
     <string name="rendering_attr_currentTrackWidth_description">Largo do GPX</string>
     <string name="free">"Libre %1$s "</string>
@@ -1841,9 +1803,9 @@ Lon %2$s</string>
     <string name="shared_string_others">Outros</string>
     <string name="poi_dialog_reopen">Reabrir</string>
     <string name="shared_string_card_was_hidden">A lapela ficou agochada</string>
-    <string name="free_downloads_used_description">Amosa a cantidade de baixadas de balde dispoñíbeis.</string>
-    <string name="save_poi_without_poi_type_message">Está na certeza de que desexa garda-lo PDI sen especifica-lo tipo\?</string>
-    <string name="use_dashboard_btn">Emprega-lo taboleiro de control</string>
+    <string name="free_downloads_used_description">Amosa a cantidade de descargas de balde dispoñíbeis.</string>
+    <string name="save_poi_without_poi_type_message">Estás na certeza de que desexas gardar o PDI sen especificar o tipo\?</string>
+    <string name="use_dashboard_btn">Empregar o taboleiro de control</string>
     <string name="use_drawer_btn">Empregar o menú</string>
     <string name="dashboard_or_drawer_title">Taboleiro de control ou menú de control</string>
     <string name="dashboard_or_drawer_description">Hai unha opción nova para controlar a aplicación principalmente mediante o flexíbel taboleiro de control ou mediante un menú estático. O que escollas pode ser mudado en calquera intre na configuración do taboleiro de control.</string>
@@ -1851,7 +1813,7 @@ Lon %2$s</string>
     <string name="only_download_over_wifi">Baixar só co Wi-Fi</string>
     <string name="live_update">Actualización ao vivo</string>
     <string name="update_now">Actualizar agora</string>
-    <string name="missing_write_external_storage_permission">O OsmAnd non ten permiso para emprega-lo cartón de memoria</string>
+    <string name="missing_write_external_storage_permission">O OsmAnd non ten permiso para empregar o cartón de memoria</string>
     <string name="last_update">Última actualización: %s</string>
     <string name="update_time">Hora da actualización</string>
     <string name="updates_size">Tamaño da actualización</string>
@@ -1872,7 +1834,7 @@ Lon %2$s</string>
     <string name="osm_user_stat">Edicións: %1$s; rango: %2$s; edicións en total: %3$s</string>
     <string name="osm_live_subscribe_btn">Subscribirse</string>
     <string name="osm_live_user_public_name">Nome público</string>
-    <string name="osm_live_hide_user_name">Non amosa-lo meu nome nos informes</string>
+    <string name="osm_live_hide_user_name">Non amosar o meu nome nos informes</string>
     <string name="osm_live_month_cost">Custo por mes</string>
     <string name="osm_live_month_cost_desc">Pagamento mensual</string>
     <string name="osm_live_active">Activo</string>
@@ -1892,9 +1854,9 @@ Lon %2$s</string>
     <string name="shared_string_add_to_map_markers">Engadir ás marcaxes do mapa</string>
     <string name="select_map_markers">Escoller marcaxes do mapa</string>
     <string name="shared_string_reverse_order">Orde inversa</string>
-    <string name="show_map_markers_description">Activa-la funcionalidade das marcaxes do mapa.</string>
+    <string name="show_map_markers_description">Activar a funcionalidade das marcaxes do mapa.</string>
     <string name="clear_active_markers_q">Desexa eliminar tódalas marcaxes activas\?</string>
-    <string name="clear_markers_history_q">Desexas limpa-lo historial de marcaxes do mapa\?</string>
+    <string name="clear_markers_history_q">Desexas limpar o historial de marcaxes do mapa\?</string>
     <string name="active_markers">Marcaxes activas</string>
     <string name="map_markers">Marcaxes dos mapas</string>
     <string name="map_marker">Marcaxe do mapa</string>
@@ -1909,7 +1871,7 @@ Lon %2$s</string>
     <string name="shared_string_read_more">Ler máis</string>
     <string name="road_blocked">Estrada bloqueada</string>
     <string name="shared_string_select">Seleccionar</string>
-    <string name="switch_start_finish">Inverte-lo punto de partida e o destino</string>
+    <string name="switch_start_finish">Inverter o punto de partida e o destino</string>
     <string name="rendering_attr_hideIcons_name">Iconas de puntos de interese</string>
     <string name="item_removed">Elemento retirado</string>
     <string name="n_items_removed">elementos retirados</string>
@@ -1958,27 +1920,27 @@ Lon %2$s</string>
     <string name="rendering_attr_contourColorScheme_name">Esquema de cores das liñas de nivel</string>
     <string name="search_hint">Insire o nome da cidade, do enderezo ou do PDI</string>
     <string name="translit_names">Transliterar os nomes</string>
-    <string name="edit_filter">Edita-las categorías</string>
+    <string name="edit_filter">Editar as categorías</string>
     <string name="subcategories">Subcategorías</string>
     <string name="selected_categories">Categorías escollidas</string>
     <string name="create_custom_poi">Crear un filtro personalizado</string>
     <string name="custom_search">Procura personalizada</string>
     <string name="shared_string_filters">Filtros</string>
-    <string name="apply_filters">Aplica-los filtros</string>
-    <string name="save_filter">Garda-lo filtro</string>
+    <string name="apply_filters">Aplicar os filtros</string>
+    <string name="save_filter">Gardar o filtro</string>
     <string name="delete_filter">Eliminar o filtro</string>
     <string name="new_filter">Filtro novo</string>
     <string name="new_filter_desc">Insire o nome do novo filtro, que se engadirá na túa lapela das \"Categorías\".</string>
-    <string name="osm_live_payment_desc">Cobraráselle unha subscrición mensual. Pode desbota-la súa subscrición na Google Play en calquera intre.</string>
+    <string name="osm_live_payment_desc">Cobraráseche unha subscrición mensual. Podes desbotar a túa subscrición na Google Play en calquera intre.</string>
     <string name="donation_to_osm">Doazón á comunidade do OSM</string>
     <string name="donation_to_osm_desc">Parte da túa doazón envíase ós contribuíntes do OSM. O custo da subscrición segue sendo a mesma.</string>
-    <string name="osm_live_subscription_desc">A subscrición permite actualizacións a cada hora, día ou semana e baixadas ilimitadas de xeito global para tódolos mapas.</string>
+    <string name="osm_live_subscription_desc">A subscrición permite actualizacións a cada hora, día ou semana e descargas ilimitadas de xeito global para todo os mapas.</string>
     <string name="get_it">Obtéñaa</string>
     <string name="get_for">Obtéñaa por %1$s</string>
     <string name="si_mi_meters">Millas/metros</string>
-    <string name="skip_map_downloading">Rexeita-la baixada dos mapas</string>
+    <string name="skip_map_downloading">Rexeitar a descarga dos mapas</string>
     <string name="skip_map_downloading_desc">Non hai ningún mapa baixado. Podes escoller un dos mapas da listaxe ou baixar mapas máis tarde dende o \"Menú - %1$s\".</string>
-    <string name="search_another_country">Elixir outra rexión</string>
+    <string name="search_another_country">Escoller outra rexión</string>
     <string name="search_map">Estase a procurar mapas…</string>
     <string name="first_usage_wizard_desc">Deixa que o OsmAnd pescude a túa localización e suxira mapas a baixar para esa rexión.</string>
     <string name="location_not_found">Localización non atopada</string>
@@ -1993,14 +1955,14 @@ Lon %2$s</string>
     <string name="no_update_info">Non mostrar as actualizacións</string>
     <string name="update_all_maps_now">Desexa actualizar tódolos mapas agora\?</string>
     <string name="clear_tile_data">Limpar tódalas teselas</string>
-    <string name="replace_favorite_confirmation">Tes a certeza de querer substituí-lo favorito \"%1$s\"\?</string>
+    <string name="replace_favorite_confirmation">Tes a certeza de querer substituír o favorito \"%1$s\"\?</string>
     <string name="coords_search">Procura de coordenadas</string>
     <string name="advanced_coords_search">Procura avanzada por coordenadas</string>
     <string name="back_to_search">Voltar á procura</string>
-    <string name="confirmation_to_delete_history_items">Desexa elimina-los elementos seleccionados do historial\?</string>
+    <string name="confirmation_to_delete_history_items">Desexas eliminar os elementos seleccionados do historial\?</string>
     <string name="show_something_on_map">Amosar %1$s no mapa</string>
     <string name="dist_away_from_my_location">Procurar a %1$s arredor</string>
-    <string name="share_history_subject">partillado ou compartido vía OsmAnd</string>
+    <string name="share_history_subject">compartido por OsmAnd</string>
     <string name="search_categories">Categorías</string>
     <string name="postcode">Código postal</string>
     <string name="shared_string_from">dende</string>
@@ -2015,10 +1977,10 @@ Lon %2$s</string>
     <string name="app_mode_train">Tren</string>
     <string name="current_track">Pista actual</string>
     <string name="map_widget_battery">Nivel da batería</string>
-    <string name="change_markers_position">Muda-la posición da marcaxe</string>
-    <string name="move_marker_bottom_sheet_title">Mova o mapa para muda-la posición da marcaxe</string>
+    <string name="change_markers_position">Mudar a posición da marcaxe</string>
+    <string name="move_marker_bottom_sheet_title">Move o mapa para mudar a posición da marcaxe</string>
     <string name="follow_us">Séguenos</string>
-    <string name="access_direction_audio_feedback_descr">Inseri-lo enderezo do destino mediante son.</string>
+    <string name="access_direction_audio_feedback_descr">Inserir o enderezo do destino mediante son.</string>
     <string name="use_osm_live_routing">Navegación do OsmAnd ao Vivo</string>
     <string name="access_no_destination">Destino non definido</string>
     <string name="access_smart_autoannounce">Anuncios automáticos intelixentes</string>
@@ -2037,11 +1999,11 @@ Lon %2$s</string>
     <string name="number_of_gpx_files_selected_pattern">%s ficheiros GPX seleccionados</string>
     <string name="osmand_plus_banner_desc">Descargas ilimitadas dos mapas, actualizacións e plugin da Wikipedia.</string>
     <string name="routing_attr_short_way_name">Camiño con aforro no combustíbel</string>
-    <string name="routing_attr_short_way_description">Emprega-lo camiño con aforro no combustíbel (normalmente máis curto).</string>
+    <string name="routing_attr_short_way_description">Empregar o camiño con aforro no combustíbel (normalmente máis curto).</string>
     <string name="shared_string_change">Mudar</string>
     <string name="get_started">Comezar</string>
     <string name="route_stops_before">%1$s paraxes antes</string>
-    <string name="access_direction_haptic_feedback_descr">Inseri-lo enderezo do destino mediante vibración.</string>
+    <string name="access_direction_haptic_feedback_descr">Inserir o enderezo do destino mediante vibración.</string>
     <string name="use_osm_live_routing_description">Activar a navegación por modificacións do OsmAnd ao Vivo.</string>
     <string name="access_disable_offroute_recalc">Non recalcular a ruta ó saírme da mesma</string>
     <string name="access_disable_offroute_recalc_descr">Non recalcula a rota, ó afastarss da mesma.</string>
@@ -2053,7 +2015,7 @@ Lon %2$s</string>
     <string name="translit_name_if_miss">Transliterar se falta o nome en %1$s</string>
     <string name="osm_live_banner_desc">Obtén descargas ilimitadas de mapas, engadindo actualizacións semanais, diarias ou cada hora.</string>
     <string name="no_inet_connection_desc_map">Obrigatorio para baixar mapas.</string>
-    <string name="search_location">Estase a procura-la localización…</string>
+    <string name="search_location">Estase a procurar a localización…</string>
     <string name="rendering_attr_hideOverground_name">Obxectos por riba do chan</string>
     <string name="access_shared_string_not_installed">Non instalado</string>
     <string name="access_widget_expand">Expandir</string>
@@ -2071,18 +2033,17 @@ Lon %2$s</string>
     <string name="legacy_search">Busca á antiga</string>
     <string name="access_map_linked_to_location">O mapa está ligado á localización</string>
     <string name="access_sort">Ordenar</string>
-    <string name="storage_directory_readonly_desc">Mudouse cara a memoria interna, porque o cartafol de almacenamento dos datos elixida está protexida contra a escritura. Escolle un cartafol de almacenamento válido.</string>
+    <string name="storage_directory_readonly_desc">Mudouse cara a memoria interna, porque o cartafol de almacenamento dos datos escollida está protexida contra a escritura. Escolle un cartafol de almacenamento válido.</string>
     <string name="shared_string_topbar">Barra de enriba</string>
-    <string name="recalculate_route">Recalcula-la rota</string>
+    <string name="recalculate_route">Recalcular a ruta</string>
     <string name="open_street_map_login_and_pass">Nome do usuario e contrasinal do OSM</string>
     <string name="donations">Doazóns</string>
     <string name="number_of_recipients">Número de destinatarios</string>
     <string name="osm_editors_ranking">Escolma de editores do OSM</string>
     <string name="osm_live_subscription">Subscrición do OsmAnd ao Vivo</string>
     <string name="osm_live_email_desc">Necesario para te informar sobre as túas contribucións.</string>
-    <string name="osm_live_thanks">Grazas por apoiar ó OsmAnd! 
-\n 
-\nPara activares tódalas funcións novas, tes que reinicia-lo OsmAnd.</string>
+    <string name="osm_live_thanks">Grazas por apoiar ó OsmAnd!
+\nPara activar todas as funcións novas, tes que reiniciar o OsmAnd.</string>
     <string name="osm_live_region_desc">Parte da túa doazón será enviada ós usuarios do OSM que fagan modificacións do mapa desa rexión.</string>
     <string name="osm_live_ask_for_purchase">Merca primeiro unha subscrición ó OsmAnd ao Vivo</string>
     <string name="osm_live_header">Esta subscrición permite actualizacións cada hora para tódolos mapas do mundo.
@@ -2093,9 +2054,9 @@ Lon %2$s</string>
 \n (Só hai dispoñíbeis {2} MB.)</string>
     <string name="upload_osm_note">Enviar nota a OSM</string>
     <string name="add_points_to_map_markers_q">Desexa engadir tódolos puntos ás marcaxes do mapa\?</string>
-    <string name="consider_turning_polygons_off">Recoméndase agocha-la visualización dos polígonos.</string>
+    <string name="consider_turning_polygons_off">Recoméndase agochar a visualización dos polígonos.</string>
     <string name="rendering_attr_showMtbRoutes_name">Amosar pistas para bicicletas de montaña</string>
-    <string name="clear_updates_proposition_message">Elimina-las actualizacións baixadas e voltar á versión orixinal do mapa</string>
+    <string name="clear_updates_proposition_message">Eliminar as actualizacións baixadas e voltar á versión orixinal do mapa</string>
     <string name="add_time_span">Engadir intre de tempo</string>
     <string name="select_voice_provider">Escoller a orientación por voz</string>
     <string name="select_voice_provider_descr">Escolle ou baixa a orientación por voz para a túa lingua.</string>
@@ -2124,7 +2085,7 @@ Lon %2$s</string>
     <string name="quick_action_item_screen">Pantalla %d</string>
     <string name="quick_action_add_marker">Engadir unha marcaxe do mapa</string>
     <string name="quick_action_add_poi">Engadir un PDI</string>
-    <string name="quick_action_map_style">Muda-lo estilo do mapa</string>
+    <string name="quick_action_map_style">Mudar o estilo do mapa</string>
     <string name="quick_action_map_style_switch">Estilo do mapa mudado para \"%s\".</string>
     <string name="quick_action_take_audio_note">Nova nota de son</string>
     <string name="quick_action_take_video_note">Nova nota de vídeo</string>
@@ -2154,15 +2115,15 @@ Lon %2$s</string>
     <string name="quick_action_showhide_poi_descr">Un botón que amosa ou agocha os PDI no mapa.</string>
     <string name="quick_action_showhide_favorites_title">Amosar/Agochar os Favoritos</string>
     <string name="quick_action_favorites_show">Amosar Favoritos</string>
-    <string name="quick_action_favorites_hide">Agocha-los Favoritos</string>
+    <string name="quick_action_favorites_hide">Agochar os Favoritos</string>
     <string name="quick_action_showhide_poi_title">Amosar/Agochar os PDI</string>
     <string name="quick_action_poi_show">Amosar %1$s</string>
     <string name="quick_action_poi_hide">Agochar %1$s</string>
     <string name="quick_action_add_category">Engadir unha categoría</string>
     <string name="quick_action_add_create_items">Crear elementos</string>
-    <string name="quick_action_add_configure_map">Configura-lo mapa</string>
+    <string name="quick_action_add_configure_map">Configurar o mapa</string>
     <string name="quick_action_add_navigation">Navegación</string>
-    <string name="quick_action_fav_name_descr">Deixar baleiro o campo para emprega-lo enderezo ou o nome do lugar.</string>
+    <string name="quick_action_fav_name_descr">Deixar baleiro o campo para empregar o enderezo ou o nome do lugar.</string>
     <string name="quick_action_bug_descr">Esta mensaxe inclúese no campo do comentario.</string>
     <string name="quick_action_bug_message">Mensaxe</string>
     <string name="quick_action_category_descr">Categoría na que desexas gardar o Favorito:</string>
@@ -2173,23 +2134,23 @@ Lon %2$s</string>
     <string name="quick_action_map_style_action">Engadir un estilo do mapa</string>
     <string name="quick_action_empty_param_error">Rechear tódolos parámetros</string>
     <string name="quick_action_map_styles">Estilos de mapa</string>
-    <string name="quick_action_map_source">Muda-la fonte do mapa</string>
+    <string name="quick_action_map_source">Mudar a fonte do mapa</string>
     <string name="quick_action_map_source_title">Fontes de mapas</string>
     <string name="quick_action_map_source_action">Engadir unha fonte de mapas</string>
     <string name="quick_action_map_source_switch">A fonte do mapa foi mudada a \"%s\".</string>
-    <string name="quick_action_btn_tutorial_title">Muda-la posición do botón</string>
+    <string name="quick_action_btn_tutorial_title">Mudar a posición do botón</string>
     <string name="quick_action_btn_tutorial_descr">Preme e arrastra neste botón para mudar a súa posición na pantalla.</string>
     <string name="shared_string_action_name">Nome da acción</string>
     <string name="animate_my_location_desc">Activar o desprazamento animado do mapa para \'A miña posición\' durante a navegación.</string>
     <string name="animate_my_location">Animar posición propia</string>
     <string name="shared_string_overview">Vista xeral</string>
-    <string name="select_street">Elixir rúa</string>
+    <string name="select_street">Escoller rúa</string>
     <string name="shared_string_in_name">en %1$s</string>
     <string name="type_address">Insire o enderezo</string>
     <string name="type_city_town">Escribe a cidade, vila ou lugar</string>
     <string name="type_postcode">Insire o código postal</string>
     <string name="nearest_cities">Cidades máis pretas</string>
-    <string name="select_city">Elixir cidade ou vila</string>
+    <string name="select_city">Escoller cidade ou vila</string>
     <string name="select_postcode">Procura por código postal</string>
     <string name="quick_action_auto_zoom">Activar ou desactivar achegamento automático do mapa</string>
     <string name="quick_action_auto_zoom_desc">Un botón para activar o desactivar o achegamento automático controlado por velocidade.</string>
@@ -2205,14 +2166,14 @@ Lon %2$s</string>
     <string name="nautical_maps">Mapas náuticos</string>
     <string name="analyze_on_map">Analizar no mapa</string>
     <string name="shared_string_visible">Visíbel</string>
-    <string name="restore_purchases">Restaura-las adquisicións</string>
+    <string name="restore_purchases">Restaurar as compras</string>
     <string name="fonts_header">Fontes das letras do mapa</string>
     <string name="right_side_navigation">Condución pola dereita</string>
     <string name="driving_region_automatic">Automático</string>
     <string name="do_not_send_anonymous_app_usage">Non enviar estatísticas anónimas de uso da aplicación</string>
     <string name="do_not_show_startup_messages">Non amosar mensaxes do inicio</string>
     <string name="parking_options">Opcións de aparcamento</string>
-    <string name="full_version_thanks">Grazas por merca-la versión de pago do OsmAnd.</string>
+    <string name="full_version_thanks">Grazas por mercar a versión de pagamento do OsmAnd.</string>
     <string name="routing_attr_relief_smoothness_factor_hills_name">Inclinado</string>
     <string name="routing_attr_relief_smoothness_factor_plains_name">Pouco inclinado</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">Chairo</string>
@@ -2234,7 +2195,7 @@ Lon %2$s</string>
     <string name="shared_string_start_time">Hora do comezo</string>
     <string name="shared_string_end_time">Hora do remate</string>
     <string name="shared_string_color">Cor</string>
-    <string name="select_gpx_folder">Escolle-lo cartafol do ficheiro GPX</string>
+    <string name="select_gpx_folder">Escoller o cartafol do ficheiro GPX</string>
     <string name="file_can_not_be_moved">Non foi posíbel mover o ficheiro.</string>
     <string name="shared_string_move">Mover</string>
     <string name="shared_string_gpx_tracks">Pistas</string>
@@ -2250,16 +2211,16 @@ Lon %2$s</string>
     <string name="shared_string_plugin">Plugin</string>
     <string name="srtm_purchase_header">Merca e instala o plugin de \'Curvas de nivel\' para amosar áreas verticais graduadas.</string>
     <string name="srtm_color_scheme">Esquema de cores</string>
-    <string name="routing_attr_allow_private_name">Permiti-lo acceso privado</string>
+    <string name="routing_attr_allow_private_name">Permitir o acceso privado</string>
     <string name="routing_attr_allow_private_description">Permitir acceso ás zonas privadas.</string>
-    <string name="change_color">Muda-la cor</string>
+    <string name="change_color">Mudar a cor</string>
     <string name="edit_name">Editar o nome</string>
     <string name="lang_fy">Frisón</string>
     <string name="favorite_category_add_new">Engadir novo</string>
     <string name="lang_ber">Bérber</string>
     <string name="lang_kn">Kannada</string>
     <string name="shared_string_install">Instalar</string>
-    <string name="improve_coverage_mapillary">Mellora-la cobertura das imaxes co Mapillary</string>
+    <string name="improve_coverage_mapillary">Mellorar a cobertura das imaxes co Mapillary</string>
     <string name="open_mapillary">Abrir Mapillary</string>
     <string name="improve_coverage_install_mapillary_desc">Instala o Mapillary para engadir unha ou máis imaxes a esta localización do mapa.</string>
     <string name="online_photos">Imaxes da rede</string>
@@ -2268,7 +2229,7 @@ Lon %2$s</string>
     <string name="quick_action_start_stop_navigation">Comezar/Deter a navegación</string>
     <string name="quick_action_start_stop_navigation_descr">Un botón para comezar ou rematar a navegación.</string>
     <string name="store_tracks_in_monthly_directories">Almacenar as pistas gravadas en cartafoles mensuais</string>
-    <string name="store_tracks_in_monthly_directories_descrp">Garda-las pistas gravadas nos subcartafoles segundo o mes da gravación (coma 2019-01).</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Gardar as pistas gravadas nos subcartafoles segundo o mes da gravación (coma 2019-01).</string>
     <string name="shared_string_reset">Restabelecer</string>
     <string name="shared_string_reload">Recargar</string>
     <string name="mapillary_menu_descr_tile_cache">Recargar as teselas para ver datos actualizados.</string>
@@ -2303,7 +2264,7 @@ Lon %2$s</string>
     <string name="route_is_calculated">Ruta calculada</string>
     <string name="round_trip">Viaxe de ida e volta</string>
     <string name="plan_route_no_markers_toast">Hai que engadir polo menos unha marcaxe para empregar esta función.</string>
-    <string name="osn_modify_dialog_error">Non foi posíbel modifica-la nota.</string>
+    <string name="osn_modify_dialog_error">Non foi posíbel modificar a nota.</string>
     <string name="osn_modify_dialog_title">Modificar nota</string>
     <string name="context_menu_item_modify_note">Modificar nota de OSM</string>
     <string name="make_round_trip_descr">Duplicar o punto de partida e engadilo coma destino.</string>
@@ -2334,7 +2295,7 @@ Lon %2$s</string>
     <string name="order_by">Ordenar por:</string>
     <string name="marker_show_distance_descr">Escolle de que xeito indicar a distancia e a dirección ás marcaxes do mapa:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Limiar de orientación do mapa</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Escolle embaixo a velocidade á que a orientación do mapa muda de «Para a dirección do movemento» cara «Para o compás».</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Escolle embaixo a velocidade á que a orientación do mapa muda de \"Para a dirección do movemento\" cara \"Para o compás\".</string>
     <string name="all_markers_moved_to_history">Tódalas marcaxes do mapa foron movidas cara o historial</string>
     <string name="marker_moved_to_history">A marcaxe do mapa foi movida cara o historial</string>
     <string name="marker_moved_to_active">A marcaxe do mapa foi movida cara os activos</string>
@@ -2359,9 +2320,9 @@ Lon %2$s</string>
     <string name="add_point_before">Engadir punto antes</string>
     <string name="add_point_after">Engadir punto despois</string>
     <string name="shared_string_options">Opcións</string>
-    <string name="measurement_tool_snap_to_road_descr">OsmAnd vai conecta-los puntos ós recursos do perfil elixido.</string>
+    <string name="measurement_tool_snap_to_road_descr">OsmAnd vai conectar os puntos ós recursos do perfil escollido.</string>
     <string name="measurement_tool_save_as_new_track_descr">Gardar os puntos, xa sexa coma puntos de ruta ou coma unha liña.</string>
-    <string name="choose_navigation_type">Elixi-lo perfil da navegación</string>
+    <string name="choose_navigation_type">Escoller o perfil de navegación</string>
     <string name="none_point_error">Engade polo menos un punto.</string>
     <string name="enter_gpx_name">Nome do ficheiro GPX:</string>
     <string name="show_on_map_after_saving">Amosar no mapa após o gardado</string>
@@ -2383,7 +2344,7 @@ Lon %2$s</string>
     <string name="show_number_pad">Amosar teclado numérico</string>
     <string name="shared_string_paste">Pegar</string>
     <string name="go_to_next_field">Seguinte campo</string>
-    <string name="rename_marker">Renomea-la marcaxe</string>
+    <string name="rename_marker">Renomear a marcaxe</string>
     <string name="tap_on_map_to_hide_interface">Modo de pantalla completa</string>
     <string name="import_as_gpx">Importar coma ficheiro GPX</string>
     <string name="import_as_favorites">Importar coma Favoritos</string>
@@ -2456,7 +2417,7 @@ Lon %2$s</string>
     <string name="shared_string_edited">Editado</string>
     <string name="shared_string_added">Engadido</string>
     <string name="marker_activated">Activouse a marcaxe %s.</string>
-    <string name="one_tap_active_descr">Prema nunha marcaxe do mapa para movela cara a parte de enriba das marcaxes activas sen abri-lo menú do contexto.</string>
+    <string name="one_tap_active_descr">Preme nunha marcaxe do mapa para movela cara a parte de enriba das marcaxes activas sen abrir o menú contextual.</string>
     <string name="one_tap_active">Activar cun toque</string>
     <string name="empty_state_av_notes">Crea notas!</string>
     <string name="empty_state_av_notes_desc">Engada unha nota de son, vídeo ou imaxe a cada punto do mapa empregando o trebello ou o menú de contexto.</string>
@@ -2469,7 +2430,7 @@ Lon %2$s</string>
     <string name="favourites_group">Categoría de favoritos</string>
     <string name="empty_state_markers_active">Faga marcaxes do mapa!</string>
     <string name="empty_state_markers_history_desc">As marcaxes marcadas coma desbotadas amósanse nesta lapela.</string>
-    <string name="tap_on_map_to_hide_interface_descr">Un toque no mapa alterna entre os botóns de control e os trebellos.</string>
+    <string name="tap_on_map_to_hide_interface_descr">Un toque no mapa troca entre os botóns de control e os trebellos.</string>
     <string name="mark_passed">Marcaxe xa ollada</string>
     <string name="shared_string_gpx_track">Pista</string>
     <string name="lang_kab">Cabila</string>
@@ -2499,10 +2460,10 @@ Lon %2$s</string>
     <string name="read_wikipedia_offline_description">Obteña unha subscrición do OsmAnd ao Vivo para ler artigos da Wikipedia e Wikiviaxes, sen conexión.</string>
     <string name="purchase_cancelled_dialog_title">Cancelaches a subscrición do OsmAnd ao Vivo</string>
     <string name="osmand_team">Equipa do OsmAnd</string>
-    <string name="welcome_to_open_beta_description">Os guieiros de viaxe, baséanse actualmente na Wikiviaxes. Proba tódolos trazos durante as probas beta abertas, de balde. Despois, os guieiros turísticas estarán dispoñíbeis para os subscritores do «OsmAnd Ilimitado» e os propietarios do «OsmAnd+».</string>
+    <string name="welcome_to_open_beta_description">Os guieiros de viaxe, baséanse actualmente na Wikiviaxes. Proba tódolos trazos durante as probas beta abertas, de balde. Despois, os guieiros turísticas estarán dispoñíbeis para os subscritores do \"OsmAnd Ilimitado\" e os propietarios do \"OsmAnd+\".</string>
     <string name="wikivoyage_travel_guide_descr">Os guieiros dos lugares máis interesantes do planeta, no OsmAnd e sen conexión á Internet.</string>
     <string name="unlock_all_features">Desbloqueares tódalas características do OsmAnd</string>
-    <string name="purchase_dialog_title">Elixir plan</string>
+    <string name="purchase_dialog_title">Escoller plan</string>
     <string name="download_maps_travel">Guieiros de viaxe</string>
     <string name="shared_string_travel_guides">Guieiros de viaxe</string>
     <string name="shared_string_gpx_waypoints">Puntos de pasaxe da pista</string>
@@ -2575,14 +2536,14 @@ Lon %2$s</string>
     <string name="touring_view_render_descr">Estilo turístico con alto contraste e máximo detalle. Inclúe todas as opcións do estilo predefinido do OsmAnd, mentres que amosa tantos detalles como sexa posíbel, en camiños, sendeiros e outros xeitos de viaxe. Clara distinción do \"atlas turístico\" entre tipos de camiños. Axeitado para emprego de día, de noite e ao ar libre.</string>
     <string name="default_render_descr">Estilo de emprego xeral. Cidade densas amosadas de xeito limpi. Conta con curvas de nivel, percorridos, calidade da superficie, restricións de acceso, sinais, visualización de camiños segundo a escala SA e elementos de deportes acuáticos.</string>
     <string name="open_wikipedia_link_online">Abrir ligazón da Wikipedia en liña</string>
-    <string name="open_wikipedia_link_online_description">A ligazón abrirase nun navigador web.</string>
-    <string name="how_to_open_link">De que xeito abri-la ligazón\?</string>
+    <string name="open_wikipedia_link_online_description">A ligazón abrirase nun navegador web.</string>
+    <string name="how_to_open_link">De que xeito abrir a ligazón\?</string>
     <string name="read_wikipedia_offline">Ler a Wikipedia sen conexión</string>
     <string name="download_all">Baixar todo</string>
-    <string name="shared_string_restart">Reinicia-la aplicación</string>
+    <string name="shared_string_restart">Reiniciar a aplicación</string>
     <string name="show_images">Amosar imaxes</string>
     <string name="purchase_cancelled_dialog_descr">Renova a subscrición para seguer a empregar tódalas funcionalidades:</string>
-    <string name="maps_you_need_descr">Baseado nos artigos favoritos, recoméndase baixa-los seguintes mapas:</string>
+    <string name="maps_you_need_descr">Baseado nos artigos favoritos, recoméndase baixar os seguintes mapas:</string>
     <string name="maps_you_need">Mapas que ti precisas</string>
     <string name="popular_destinations">Destinos populares</string>
     <string name="paid_app">Aplicación de pagamento</string>
@@ -2592,7 +2553,7 @@ Lon %2$s</string>
     <string name="update_is_available">Actualización dispoñíbel</string>
     <string name="download_file">Baixar ficheiro</string>
     <string name="start_editing_card_image_text">O guieiro de viaxe libre e global que calquera pode editar.</string>
-    <string name="start_editing_card_description">Podes e debes editar calquera artigo no Wikiviaxes. Compartilla o teu coñecemento, experiencia, talento e atención.</string>
+    <string name="start_editing_card_description">Podes e debes editar calquera artigo no Wikiviaxes. Comparte o teu coñecemento, experiencia, talento e atención.</string>
     <string name="start_editing">Comezar edición</string>
     <string name="get_unlimited_access">Obter acceso ilimitado</string>
     <string name="welcome_to_open_beta">Benvido á beta aberta</string>
@@ -2604,7 +2565,7 @@ Lon %2$s</string>
     <string name="in_app_purchase_desc_ex">Unha vez mercado, ficará de xeito permanente dispoñíbel pra ti.</string>
     <string name="purchase_unlim_title">Mercar - %1$s</string>
     <string name="wikivoyage_offline">Wikiviaxes sen conexión</string>
-    <string name="unlimited_downloads">Baixadas sen límite</string>
+    <string name="unlimited_downloads">Descargas sen límite</string>
     <string name="wikipedia_offline">Wikipedia sen conexión</string>
     <string name="contour_lines_hillshade_maps">Curvas do nivel e mapas de asombreado</string>
     <string name="purchase_dialog_travel_description">Mercar un dos seguintes elementos para recibires a característica do guieiro de viaxe sen conexión:</string>
@@ -2618,7 +2579,7 @@ Lon %2$s</string>
     <string name="shared_string_wifi_only">Só co Wi-Fi</string>
     <string name="select_travel_book">Escoller un libro de viaxe</string>
     <string name="shared_string_travel_book">Libro de viaxes</string>
-    <string name="online_webpage_warning">A páxina só está dispoñíbel en liña. Abrila nun navigador web\?</string>
+    <string name="online_webpage_warning">A páxina só está dispoñíbel en liña. Abrila nun navegador web\?</string>
     <string name="images_cache">Caché das imaxes</string>
     <string name="delete_search_history">Eliminar historial das procuras</string>
     <string name="download_images">Baixar imaxes</string>
@@ -2657,7 +2618,7 @@ Lon %2$s</string>
     <string name="show_from_zoom_level">Amosar dende o nivel de achegamento</string>
     <string name="quick_action_add_first_intermediate">Engadir primeiro destino intermedio</string>
     <string name="no_underlay">Sen subxacencia</string>
-    <string name="subscribe_email_desc">Subscríbete á nosa listaxe de correo electrónico para recibires descontos da aplicación e obter 3 baixadas de mapas máis!</string>
+    <string name="subscribe_email_desc">Subscríbete á nosa listaxe de correo electrónico para recibir descontos da aplicación e obter 3 descargas de mapas máis!</string>
     <string name="depth_contour_descr">Curvas do afundimento e marcaxes náuticas.</string>
     <string name="sea_depth_thanks">Grazas por mercar \"Curvas do afundimento náuticos\"</string>
     <string name="index_item_depth_contours_osmand_ext">Curvas do afundimento náuticos</string>
@@ -2666,7 +2627,7 @@ Lon %2$s</string>
     <string name="download_depth_countours">Curvas do afundimento náuticos</string>
     <string name="do_not_send_anonymous_app_usage_desc">O OsmAnd recompila información sobre as lapelas que abres na aplicación. Non estamos a recompilar datos da localización, datos inseridos na aplicación ou datos relacionados coas áreas que ollas, procuras ou baixas.</string>
     <string name="do_not_show_startup_messages_desc">Agocha os descontos da aplicación e as mensaxes especiais dos acontecementos locais.</string>
-    <string name="routing_attr_relief_smoothness_factor_name">Elixir variación da altitude</string>
+    <string name="routing_attr_relief_smoothness_factor_name">Escoller variación da altitude</string>
     <string name="routing_attr_height_obstacles_description">Inclúe coma factor, a altitude do terreo (segundo datos do SRTM, ASTER e EU-DEM).</string>
     <string name="rendering_attr_depthContours_description">Amosar curvas e puntos do afundimento.</string>
     <string name="rendering_attr_depthContours_name">Curvas do afundimento náuticos</string>
@@ -2695,9 +2656,9 @@ Lon %2$s</string>
     <string name="lang_lo">Laosiano</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Cor por símbolo do sendeirismo OSMC</string>
     <string name="shared_string_gpx_files">Ficheiros GPX</string>
-    <string name="plugin_ski_descr">Este plugin para o OsmAnd pon ó teu acade detalles sobre pistas do esquí de baixada, de travesía, roteiros do esquí alpino, teleféricos e refachos a nivel mundial. As rotas e pistas amósanse polo código de cor en función da súa dificuldade e representados cun estilo do mapa especial «Inverno» que o asemella a unha paisaxe invernal nevada. 
+    <string name="plugin_ski_descr">Este plugin para o OsmAnd pon ó teu acade detalles sobre pistas do esquí de baixada, de travesía, roteiros do esquí alpino, teleféricos e refachos a nivel mundial. As rotas e pistas amósanse polo código de cor en función da súa dificuldade e representados cun estilo do mapa especial \"Inverno\" que o asemella a unha paisaxe invernal nevada. 
 \n 
-\nActivando esta vista, muda o estilo do mapa a «Inverno e esquí», amosando as características do terreo en condicións invernais. Esta vista pódese revertir desactivando de novo eiquí ou mudando o «Estilo do mapa» en «Configurar mapa» cando o desexes.</string>
+\nActivando esta vista, muda o estilo do mapa a «Inverno e esquí», amosando as características do terreo en condicións invernais. Esta vista pódese revertir desactivando de novo eiquí ou mudando o \"Estilo do mapa\" en \"Configurar mapa\" cando o desexes.</string>
     <string name="navigate_point_olc">Código de Localización Aberto (OLC)</string>
     <string name="navigate_point_olc_info_invalid">OLC non válido
 \n</string>
@@ -2715,7 +2676,7 @@ Lon %2$s</string>
 \n Desfruta do navegador por voz e óptico, a visualización dos PDI (puntos de interese), a creación e xestión das pistas GPX, emprega a información de visualización e a altitude das curvas do nivel (mediante un plugin), escolle entre modos de automóbil, bicicleta ou peón, edita no OSM e moito máis.</string>
     <string name="osmand_extended_description_part4">Esquí 
 \nO plugin do OsmAnd para o estilo do mapa de inverno, amosa pistas co nivel de complexidade e algunha información adicional, coma a localización dos elevadoiros e outras instalacións invernais.</string>
-    <string name="osmand_extended_description_part8">O OsmAnd é activamente software de código aberto desenvolvido. Todo o mundo pode contribuír á aplicación ó informar de erros, mellorando traducións ou desenvolvendo funcións novas. Ademais o proxecto confía en contribucións financeiras para financia-lo desenvolvemento e probando de funcións novas. 
+    <string name="osmand_extended_description_part8">O OsmAnd é software de código aberto desenvolvido activamente. Todo o mundo pode contribuír á aplicación ó informar de erros, mellorando traducións ou desenvolvendo funcións novas. Ademais o proxecto confía en contribucións financeiras para financiar o desenvolvemento e probando de funcións novas. 
 \n Cobertura do mapa e calidade: 
 \n • Europa Occidental: **** 
 \n • Europa Oriental: *** 
@@ -2727,8 +2688,8 @@ Lon %2$s</string>
 \n • Oriente medio: ** 
 \n • África: ** 
 \n • Antártida: * 
-\n A maioría de países ó redor do mundo están dispoñíbeis para baixar! 
-\n Conseguir un explorador fiábel no voso país - selo Francia, Alemaña, México, UK, España, Países Baixos, EE.UU., Rusia, Brasil ou algún outro.</string>
+\n A meirande parte de países ó redor do mundo están dispoñíbeis para baixar! 
+\n Consegue un explorador fiábel no teu país xa sexa Francia, Alemaña, México, UK, España, Países Baixos, EE.UU., Rusia, Brasil ou algún outro.</string>
     <string name="live_monitoring_max_interval_to_send">Tempo do carregado (búfer) para o seguemento en liña</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Especifica o tempo que o carregado (búfer) manterá as localizacións para enviar sen conexión</string>
     <string name="number_of_rows_in_dash">Número de filas no taboleiro %1$s</string>
@@ -2772,9 +2733,9 @@ Lon %2$s</string>
     <string name="download_wikipedia_description">Baixa os artigos da Wikipedia de %1$s para lelos sen conexión.</string>
     <string name="download_wikipedia_label">Baixar datos da Wikipedia</string>
     <string name="open_in_browser_wiki">Abrir artigo en liña</string>
-    <string name="open_in_browser_wiki_description">Olla-lo artigo nun navigador web.</string>
+    <string name="open_in_browser_wiki_description">Ollar o artigo nun navegador web.</string>
     <string name="download_wiki_region_placeholder">esta rexión</string>
-    <string name="wiki_article_search_text">Estase a procura-lo artigo da wiki correspondente</string>
+    <string name="wiki_article_search_text">Estase a procurar o artigo da wiki correspondente</string>
     <string name="wiki_article_not_found">Artigo non atopado</string>
     <string name="how_to_open_wiki_title">De que xeito abrir artigos da Wikipedia\?</string>
     <string name="test_voice_desrc">Preme un botón e escoita o seu correspondente aviso por voz para saber se falla algo ou está defectuoso</string>
@@ -2845,20 +2806,20 @@ Lon %2$s</string>
     <string name="osmand_plus_extended_description_part3">Vista do mapa 
 \n • Amosa a túa posición e orientación 
 \n • (Opcional) Axusta o mapa á dirección do movemento (ou o compás) 
-\n • Garda sitios importantes nos «Favoritos» 
+\n • Garda sitios importantes nos \"Favoritos\" 
 \n • Amosa os PDI (puntos de interese) ó seu arredor 
 \n • Amosa teselas en liña especiais, ollada satelital (do Bing), diferentes sobreposicións coma pistas da travesía/navegación GPX e capas adicionais con transparencia personalizábel 
-\n • Permite elixir de que xeito amosa-los nomes no mapa: en inglés, local, ou ortografía fonética
+\n • Permite escoller de que xeito amosar os nomes no mapa: en inglés, local, ou ortografía fonética
 \n</string>
     <string name="osmand_plus_extended_description_part4">Emprego dos datos do OSM e da Wikipedia 
 \n • Información de alta calidade do mellor proxecto colaborativo do mundo 
 \n • Datos do OSM dispoñíbeis por país ou rexión 
 \n • PDI da Wikipedia, ideal para o turismo 
-\n • Baixadas de balde ilimitadas, de xeito directo dende a aplicación 
+\n • Descargas de balde ilimitadas, de xeito directo dende a aplicación 
 \n • Mapas vectoriais reducidos sen conexión, actualizados polo menos unha vez cada mes 
 \n • Escolle entre datos completos da rexión ou só a rede de estradas (Exemplo: Todo o Xapón ten 700 MB ou só 200 MB para a rede de estradas)</string>
     <string name="osmand_plus_extended_description_part5">Funcións de seguranza 
-\n • (Opcional) O modo día/noite alternase de xeito automático 
+\n • (Opcional) O modo día/noite trócase de xeito automático 
 \n • (Opcional) Visualización do límite de velocidade, con aviso ó excederche 
 \n • (Opcional) Achegamento do mapa segundo a velocidade 
 \n • Compartilla a túa localización para que as túas amizades poidan atoparche
@@ -2926,7 +2887,7 @@ Lon %2$s</string>
     <string name="osm_live_subscriptions">Subscricións</string>
     <string name="mapillary_menu_title_pano">Amosar só imaxes 360°</string>
     <string name="shared_string_launch">Executar</string>
-    <string name="run_full_osmand_msg">Estás a emprega-lo mapa {0} que funciona co OsmAnd. Desexas executar a versión completa do OsmAnd\?</string>
+    <string name="run_full_osmand_msg">Estás a empregar o mapa {0} que funciona co OsmAnd. Desexas executar a versión completa do OsmAnd\?</string>
     <string name="run_full_osmand_header">Executar OsmAnd\?</string>
     <string name="cubic_m">m³</string>
     <string name="metric_ton">t</string>
@@ -3066,8 +3027,8 @@ Lon %2$s</string>
     <string name="routing_attr_avoid_tram_description">Evitar tranvías</string>
     <string name="routing_attr_avoid_bus_name">Sen buses</string>
     <string name="routing_attr_avoid_bus_description">Evitar buses e trolebuses</string>
-    <string name="routing_attr_avoid_share_taxi_name">Sen taxis compartillados</string>
-    <string name="routing_attr_avoid_share_taxi_description">Evitar taxis compartillados</string>
+    <string name="routing_attr_avoid_share_taxi_name">Sen taxis compartidos</string>
+    <string name="routing_attr_avoid_share_taxi_description">Evitar taxis compartidos</string>
     <string name="routing_attr_avoid_train_name">Sen trens</string>
     <string name="routing_attr_avoid_train_description">Evitar trens</string>
     <string name="routing_attr_avoid_subway_name">Sen metros</string>
@@ -3113,7 +3074,7 @@ Lon %2$s</string>
     <string name="make_osmand_better_descr">Permite que o OsmAnd recompile e procese datos anónimos de uso da aplicación. Non recompilamos datos sobre a túa localización, nin sobre os lugares que ves no mapa. 
 \n 
 \nConfigura en calquera intre en \"Axustes\" → \"Privacidade e seguranza\".</string>
-    <string name="choose_data_to_share">Escoller os tipos de datos a compartillar:</string>
+    <string name="choose_data_to_share">Escoller os tipos de datos a compartir:</string>
     <string name="downloaded_maps">Mapas baixados</string>
     <string name="visited_screens">Pantallas visitadas</string>
     <string name="collected_data_descr">Define que datos permites que o OsmAnd compartille.</string>
@@ -3121,7 +3082,7 @@ Lon %2$s</string>
     <string name="visited_screens_collect_descr">Axúdanos a comprender a popularidade das funcións do OsmAnd.</string>
     <string name="privacy_and_security_change_descr">Preme en \"Permitir\" se concordas coa nosa %1$s</string>
     <string name="settings_privacy_and_security">Privacidade e seguranza</string>
-    <string name="settings_privacy_and_security_desc">Escolle que datos compartillas</string>
+    <string name="settings_privacy_and_security_desc">Escolle que datos compartes</string>
     <string name="shared_string_no_thank_you">Non, grazas</string>
     <string name="shared_string_allow">Permitir</string>
     <string name="profile_name_hint">Nome do perfil</string>
@@ -3131,7 +3092,7 @@ Lon %2$s</string>
     <string name="app_mode_subway">Metro</string>
     <string name="app_mode_horse">Cabalo</string>
     <string name="app_mode_helicopter">Helicóptero</string>
-    <string name="osmand_routing_promo">Podes engadir a túa propia versión modificada do «routing.xml» en «..osmand/routing»</string>
+    <string name="osmand_routing_promo">Podes engadir a túa propia versión modificada do \"routing.xml\" en \"..osmand/routing\"</string>
     <string name="app_mode_skiing">Esquí</string>
     <string name="base_profile_descr_ski">Esquí</string>
     <string name="show_compass_ruler">Amosar a regra de compás</string>
@@ -3154,7 +3115,7 @@ Lon %2$s</string>
     <string name="profile_alert_delete_title">Eliminar perfil</string>
     <string name="profile_alert_delete_msg">Tes a certeza de que desexas eliminar o perfil \"%s\"</string>
     <string name="select_base_profile_dialog_title">Escoller o perfil para comezar</string>
-    <string name="process_downloading_service">Servizo de baixadas do OsmAnd</string>
+    <string name="process_downloading_service">Servizo de descargas do OsmAnd</string>
     <string name="shared_string_color_magenta">Maxenta</string>
     <string name="shared_string_icon">Icona</string>
     <string name="collected_data">Datos recollidos</string>
@@ -3166,7 +3127,7 @@ Lon %2$s</string>
     <string name="minmax_speed_dialog_title">Estabelecer velocidade mínima/máxima</string>
     <string name="new_profile">Novo perfil</string>
     <string name="shared_string_crash">Erro</string>
-    <string name="last_launch_crashed">O último lanzamento do OsmAnd fallou. Axúdanos a mellorar o OsmAnd compartillando a mensaxe de erro.</string>
+    <string name="last_launch_crashed">O último lanzamento do OsmAnd fallou. Axúdanos a mellorar o OsmAnd compartindo a mensaxe de erro.</string>
     <string name="select_base_profile_dialog_message">Basea o teu perfil personalizado nun dos perfís de aplicación predeterminados, isto define os axustes básicos coma a visibilidade dos trebellos e as unidades de velocidade e distancia. Estes son os perfís de aplicación predeterminados, xunto con exemplos de perfís personalizados que poden ser amplíados:</string>
     <string name="select_nav_profile_dialog_title">Escoller o tipo de navegación</string>
     <string name="base_profile_descr_car">Automóbil, camión, motocicleta</string>
@@ -3218,7 +3179,7 @@ Lon %2$s</string>
 \n 
 \n • Engade a opción de amosar o compás no mapa cunha regra de raio 
 \n 
-\n • Melloradas as baixadas de mapas en segundo plano 
+\n • Melloradas as descargas de mapas en segundo plano 
 \n 
 \n• Volta a opción de \'Activar pantalla\' 
 \n 
@@ -3357,7 +3318,7 @@ Lon %2$s</string>
 \n%1$s &gt; %2$s</string>
     <string name="enter_path_to_folder">Insire a ruta do cartafol</string>
     <string name="shared_string_select_folder">Cartafol…</string>
-    <string name="paste_Osmand_data_folder_path">Colar ou pegar a ruta do cartafol cos datos do OsmAnd</string>
+    <string name="paste_Osmand_data_folder_path">Pegar a ruta do cartafol cos datos do OsmAnd</string>
     <string name="change_osmand_data_folder_question">Mudar o cartafol de datos do OsmAnd\?</string>
     <string name="move_maps_to_new_destination">Mover ó novo destino</string>
     <string name="internal_app_storage_description">Almacenamento interno para o OsmAnd, (agochado ós usuarios e outras aplicacións).</string>
@@ -3428,7 +3389,7 @@ Lon %2$s</string>
 \n
 \n</string>
     <string name="apply_preference_to_all_profiles">Podes aplicar esta modificación a todos ou só ós perfís seleccionados.</string>
-    <string name="shared_preference">Compartillado</string>
+    <string name="shared_preference">Compartido</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Preferir estradas sen pavimentar</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Preferir as estradas sen pavimentar aos pavimentados para o trazado de rutas.</string>
     <string name="swap_start_and_destination">Trocar comezo e destino</string>
@@ -3452,7 +3413,7 @@ Lon %2$s</string>
     <string name="file_import_error">Erro de importación de %1$s: %2$s</string>
     <string name="file_imported_successfully">%1$s importado.</string>
     <string name="rendering_value_white_name">Branco</string>
-    <string name="swap_two_places">Alternar %1$s e %2$s</string>
+    <string name="swap_two_places">Trocar %1$s e %2$s</string>
     <string name="route_start_point">Punto de comezo</string>
     <string name="track_saved">Pista gardada</string>
     <string name="empty_filename">O nome do ficheiro está baleiro</string>
@@ -3648,16 +3609,16 @@ Lon %2$s</string>
     <string name="app_mode_ski_snowmobile">Moto de neve</string>
     <string name="custom_osmand_plugin">Plugin personalizado do OsmAnd</string>
     <string name="shared_string_items">Elementos</string>
-    <string name="changes_applied_to_profile">Modificacións aplicadas ó perfil %1$s.</string>
-    <string name="settings_item_read_error">Non foi posíbel ler %1$s.</string>
-    <string name="settings_item_write_error">Non foi posíbel escribir %1$s.</string>
-    <string name="settings_item_import_error">Non foi posíbel importar %1$s.</string>
+    <string name="changes_applied_to_profile">Modificacións aplicadas ó perfil \'%1$s\'.</string>
+    <string name="settings_item_read_error">Non foi posíbel ler \'%1$s\'.</string>
+    <string name="settings_item_write_error">Non foi posíbel escribir en \'%1$s\'.</string>
+    <string name="settings_item_import_error">Non foi posíbel importar de \'%1$s\'.</string>
     <string name="select_track_file">Escoller ficheiro da pista</string>
     <string name="shared_string_languages">Linguas</string>
     <string name="shared_string_language">Lingua</string>
     <string name="shared_string_all_languages">Todas as linguas</string>
     <string name="wiki_menu_download_descr">Precísanse mapas adicionais para ollar os PDI da Wikipedia no mapa.</string>
-    <string name="main_actions_descr">As accións principais conteñen só 4 botóns.</string>
+    <string name="main_actions_descr">As \"Accións principais\" conteñen só 4 botóns.</string>
     <string name="main_actions">Accións principais</string>
     <string name="move_inside_category">Só podes mover obxectos dentro desta categoría.</string>
     <string name="select_wikipedia_article_langs">Escolle as linguas nas que os artigos da Wikipedia aparecerán no mapa. Podes trocar entre todos as linguas dispoñíbeis en canto leas o artigo.</string>
@@ -3706,7 +3667,7 @@ Lon %2$s</string>
     <string name="import_complete_description">Todos os datos de %1$s son importados, podes empregar os botóns de abaixo para abrir a parte necesaria da aplicación para xestionala.</string>
     <string name="shared_string_import_complete">Importación completada</string>
     <string name="items_added">Elementos engadidos</string>
-    <string name="checking_for_duplicate_description">OsmAnd comproba %1$s para ver se hai duplicados cos elementos existentes na aplicación. 
+    <string name="checking_for_duplicate_description">O OsmAnd comproba %1$s para ver se hai duplicados cos elementos existentes na aplicación. 
 \n 
 \nPode levar algún tempo.</string>
     <string name="shared_string_importing">Estase a importar</string>
@@ -3741,5 +3702,43 @@ Lon %2$s</string>
     <string name="divider_descr">Elementos abaixo deste punto separados por un divisor.</string>
     <string name="shared_string_hidden">Agochado</string>
     <string name="hidden_items_descr">Estes elementos non se amosan no menú, mais as opcións ou plugins que representan seguirán a funcionar.</string>
-    <string name="reset_items_descr">Os axustes restabeleceranse ó estado orixinal após agocharse.</string>
+    <string name="reset_items_descr">Agochar configuracións que as restabelece ó seu estado orixinal.</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">Cárgase na túa conta da Google Play ó mercar unha subscrición 
+\ne cando expira (mes/trimestre/ano), 
+\nnon se renovará se é desbotada antes desa data nos axustes da Google Play.</string>
+    <string name="search_poi_types">Procurar tipos de PDI</string>
+    <string name="search_poi_types_descr">Combina tipos de PDI de diferentes categorías. Preme en \"Trocar\" para marcar todo, preme o lado esquerdo para escoller unha categoría.</string>
+    <string name="download_unsupported_action">Acción %1$s non admitida</string>
+    <string name="tracker_item">Rastrexador do OsmAnd</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Acción rápida</string>
+    <string name="radius_ruler_item">Regra de raio</string>
+    <string name="measure_distance_item">Medir distancia</string>
+    <string name="travel_item">Viaxes (Wikiviaxes e Wikipedia)</string>
+    <string name="map_markers_item">Marcaxes do mapa</string>
+    <string name="favorites_item">Favoritos</string>
+    <string name="subscription_osmandlive_item">Subscrición - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Compras do OsmAnd</string>
+    <string name="legend_item_description">A guía para a simboloxía dun mapa</string>
+    <string name="navigation_profiles_item">Perfís de navegación</string>
+    <string name="release_3_7">• Novos mapas sen conexión das pendentes
+\n
+\n • Personalización máis completa dos favoritos e puntos de referencia GPX (cores personalizadas, iconas, formas)
+\n
+\n • Nova personalización na orde dos elementos en Configurar mapa, menú contextual e menú lateral
+\n
+\n • A Wikipedia agora visualízase coma una capa separada en Configurar mapa, escolle só as linguas precisas
+\n
+\n • Crea o teu propio filtro/mapas de puntos de interese, con total flexibilidade
+\n
+\n • Engadíronse opcións para restabelecer os axustes dos perfís personalizados
+\n
+\n • As rutas GPX para a navegación, agora admiten os carrís de tráfico e completan as instrucións de xiro
+\n
+\n • Corrixiuse o tamaño da interface nas tabletas
+\n
+\n • Corrixíronse os errores co RTL
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 45d01f1439..eb1c52423d 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -3540,7 +3540,7 @@
     <string name="shared_string_routing">ניתוב</string>
     <string name="listed_exist">%1$s מוצג, כבר קיים ב־OsmAnd.</string>
     <string name="clear_recorded_data_warning">למחוק את הנתונים שהוקלטו\?</string>
-    <string name="importing_from">מיובאים נתונים מתוך %1</string>
+    <string name="importing_from">מיובאים נתונים מתוך %1$s</string>
     <string name="shared_string_importing">מתבצע ייבוא</string>
     <string name="checking_for_duplicate_description">OsmAnd יחפש כפילויות של %1$s עם פריטים קיימים ביישומון.
 \n
diff --git a/OsmAnd/res/values-large-land/sizes.xml b/OsmAnd/res/values-large-land/sizes.xml
index 35bc80ed66..888ab15729 100644
--- a/OsmAnd/res/values-large-land/sizes.xml
+++ b/OsmAnd/res/values-large-land/sizes.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="empty_state_image_margin_top">59dp</dimen>
-    <dimen name="empty_state_image_margin_bottom">59dp</dimen>
+
 
     <dimen name="measurement_tool_content_padding_medium">21dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 02acb86b39..62e9b00b78 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<dimen name="card_content_padding_large">42dp</dimen>
     <dimen name="map_trans_seek_size">120dp</dimen>
 	<dimen name="map_widget_text_size">35sp</dimen>
 	<dimen name="map_top_widget_text_size">33sp</dimen>
@@ -48,7 +47,6 @@
 
 	<dimen name="map_widget_icon_margin">3dp</dimen>
 
-	<dimen name="standard_icon_size">36dp</dimen>
 
 	<!-- ContextMenu -->
 	<dimen name="context_menu_top_shadow_h">30dp</dimen>
@@ -93,63 +91,11 @@
 	<dimen name="fab_margin_bottom_big">108dp</dimen>
 
 	<!-- General -->
-	<dimen name="dialog_button_height">54dp</dimen>
-	<dimen name="dialog_button_ex_height">90dp</dimen>
 
-	<dimen name="list_item_height">65dp</dimen>
-	<dimen name="list_header_height">60dp</dimen>
-	<dimen name="dashboard_map_top_padding">480dp</dimen>
-	<dimen name="dashboard_land_width">480dp</dimen>
-	<dimen name="dashboard_map_toolbar">84dp</dimen>
-
-	<dimen name="favorites_icon_top_margin">13dp</dimen>
-	<dimen name="favorites_icon_size">60dp</dimen>
-	<dimen name="favorites_icon_padding">3dp</dimen>
-	<dimen name="favorites_list_item_height">90dp</dimen>
-	<dimen name="favorites_select_group_button_height">114dp</dimen>
-	<dimen name="favorites_select_group_button_width">213dp</dimen>
-	<dimen name="favorites_select_icon_button_right_padding">14dp</dimen>
-	    <!-- TextSizes -->
-    <dimen name="default_list_text_size_large">22sp</dimen>
-    <dimen name="default_list_text_size">18sp</dimen>
-    <dimen name="default_desc_text_size">16sp</dimen>
-    <dimen name="default_sub_text_size">14sp</dimen>
-	<dimen name="default_sub_text_size_small">12sp</dimen>
-	<dimen name="welcome_header_text_size">27sp</dimen>
-	<dimen name="text_button_text_size">22sp</dimen>
-	<dimen name="travel_card_primary_text_size">22sp</dimen>
-
-	<dimen name="dialog_header_text_size">24sp</dimen>
-
-	<dimen name="default_split_segments_overview">15sp</dimen>
-	<dimen name="default_split_segments_data">15sp</dimen>
-	<dimen name="default_split_segments_sub">12sp</dimen>
-
-	<dimen name="empty_state_image_margin_top">63dp</dimen>
-	<dimen name="empty_state_image_margin_bottom">45dp</dimen>
-	<dimen name="empty_state_text_interval">12dp</dimen>
-	<dimen name="empty_state_button_margin_top">30dp</dimen>
-	<dimen name="empty_state_text_size">20sp</dimen>
-	<dimen name="empty_state_text_desc_size">18sp</dimen>
-	<dimen name="empty_state_text_desc_margin">68dp</dimen>
-	<dimen name="empty_state_image_margin_left">138dp</dimen>
-	<dimen name="empty_state_text_button_padding_left">72dp</dimen>
-	<dimen name="empty_state_text_button_padding_right">90dp</dimen>
-	<dimen name="empty_state_text_button_padding_top">96dp</dimen>
-
-	<dimen name="bottom_sheet_cancel_button_height">72dp</dimen>
-	<dimen name="landscape_bottom_sheet_dialog_fragment_width">540dp</dimen>
 
 	<dimen name="measurement_tool_select_radius">30dp</dimen>
-	<dimen name="bottom_sheet_content_margin">24dp</dimen>
-	<dimen name="bottom_sheet_content_margin_small">12dp</dimen>
-	<dimen name="content_padding">24dp</dimen>
-	<dimen name="content_padding_small">18dp</dimen>
-	<dimen name="content_padding_half">12dp</dimen>
-	<dimen name="bottom_sheet_content_padding_small">12dp</dimen>
 	<dimen name="measurement_tool_divider_margin">12dp</dimen>
 	<dimen name="measurement_tool_content_padding_medium">18dp</dimen>
-	<dimen name="text_margin_small">6dp</dimen>
 	<dimen name="measurement_tool_text_margin">12dp</dimen>
 	<dimen name="measurement_tool_points_list_container_height">330dp</dimen>
 	<dimen name="measurement_tool_up_down_row_height">48dp</dimen>
@@ -162,26 +108,10 @@
 	<dimen name="measurement_tool_button_margin">12dp</dimen>
 	<dimen name="measurement_tool_button_padding">12dp</dimen>
 	<dimen name="measurement_tool_button_height">54dp</dimen>
-	<dimen name="bottom_sheet_title_height">78dp</dimen>
-	<dimen name="bottom_sheet_descr_height">66dp</dimen>
-	<dimen name="bottom_sheet_list_item_height">72dp</dimen>
-	<dimen name="bottom_sheet_large_list_item_height">96dp</dimen>
-	<dimen name="bottom_sheet_icon_margin">36dp</dimen>
-	<dimen name="bottom_sheet_divider_margin_top">11dp</dimen>
-	<dimen name="bottom_sheet_divider_margin_bottom">12dp</dimen>
-	<dimen name="bottom_sheet_divider_margin_start">84dp</dimen>
-	<dimen name="bottom_sheet_image_text_margin_start">15dp</dimen>
-	<dimen name="bottom_sheet_selected_item_title_height">84dp</dimen>
-	<dimen name="bottom_sheet_big_item_height">192dp</dimen>
 
-	<dimen name="action_bar_image_width_land">354dp</dimen>
-	<dimen name="action_bar_image_top_margin_land">102dp</dimen>
-	<dimen name="action_bar_image_height">330dp</dimen>
-	<dimen name="action_bar_image_side_margin">105dp</dimen>
 
 	<dimen name="map_markers_recycler_view_padding_bottom">78dp</dimen>
 	<dimen name="map_markers_recycler_view_padding_top">15dp</dimen>
-
 	<dimen name="shadow_height">8dp</dimen>
 	<dimen name="map_marker_title_height">42dp</dimen>
 
@@ -225,34 +155,6 @@
     <dimen name="grid_menu_item_sides_margin">60dp</dimen>
 
 	<dimen name="bottom_sheet_menu_peek_height">450dp</dimen>
-
 	<dimen name="side_of_the_world_button_size">54dp</dimen>
 
-	<dimen name="coords_input_show_hide_keyboard_btn_padding">19dp</dimen>
-
-	<dimen name="toolbar_height">84dp</dimen>
-
-	<dimen name="wikivoyage_search_list_header_height">54dp</dimen>
-	<dimen name="wikivoyage_article_card_icon_size">120dp</dimen>
-	<dimen name="wikivoyage_article_card_alternative_icon_height">60dp</dimen>
-	<dimen name="wikivoyage_welcome_image_top_margin">42dp</dimen>
-	<dimen name="wikivoyage_welcome_title_top_margin">30dp</dimen>
-	<dimen name="wikivoyage_welcome_title_bottom_margin">23dp</dimen>
-	<dimen name="wikivoyage_welcome_content_margin">48dp</dimen>
-	<dimen name="wikivoyage_card_button_height">54dp</dimen>
-	<dimen name="wikivoyage_search_icon_margin_left">21dp</dimen>
-	<dimen name="wikivoyage_search_icon_margin_right">33dp</dimen>
-	<dimen name="wikivoyage_search_divider_margin_start">82dp</dimen>
-	<dimen name="wikivoyage_explore_card_image_height">216dp</dimen>
-	<dimen name="wikivoyage_travel_card_button_padding">24dp</dimen>
-	<dimen name="wikivoyage_start_editing_card_text_image_padding">60dp</dimen>
-	<dimen name="wikivoyage_show_images_dialog_buttons_height">66dp</dimen>
-
-	<dimen name="wikilink_bottom_sheet_padding">21dp</dimen>
-
-	<dimen name="setting_profile_item_height">96dp</dimen>
-	<dimen name="settings_divider_margin_start">108dp</dimen>
-	<dimen name="setting_list_item_large_height">108dp</dimen>
-
-	<dimen name="download_description_images_height">198dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index 3111367ad9..774b3fb332 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -1013,7 +1013,7 @@
 \n 
 \nDe globale dataene (mellom 70° nord og 70° sør) er basert på målinger av SRTM (Shuttle Radar Topography Mission) og ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), et bildeinstrument ombord på Terra, flaggskipsatellitten til NASA\'s Earth Observing System. ASTER er et samarbeid mellom NASA, Japans finansdepartement, Trade and Industry (METI), og Japan Space Systems (J-spacesystems).</string>
     <string name="plugin_ski_name">Skikartvisning</string>
-    <string name="osmand_accessibility_description">Dette programtillegget gjør enhetens tilgjengelighetsfunksjoner tilgjengelige direkte i OsmAnd. Det muliggjør f.eks justering av talehastigheten for tekst-til-tale -stemmer, innstilling av styrekors-skjermnavigering ved hjelp av en styrekule for forstørrelseskontroll, eller tekst-til-tale-tilbakemelding, f.eks auto-annonsering av din posisjon.</string>
+    <string name="osmand_accessibility_description">Gjør enhetens tilgjengelighetsfunksjoner tilgjengelige direkte i OsmAnd. Det muliggjør f.eks. justering av talehastigheten for tekst-til-tale -stemmer, innstilling av styrekors-skjermnavigering ved hjelp av en styrekule for forstørrelseskontroll, eller tekst-til-tale-tilbakemelding, f.eks. auto-annonsering av din posisjon.</string>
     <string name="rename_failed">Navneendring feilet.</string>
     <string name="anonymous_user">Anonym bruker</string>
     <string name="open_street_map_login_descr">Trengs for bidrag til openstreetmap.org.</string>
@@ -2781,7 +2781,7 @@
     <string name="shared_string_gpx_files">GPX-filer</string>
     <string name="get_osmand_live">Skaff deg OsmAnd Live for å låse opp alle funksjoner: Daglige kartoppdateringer med ubegrensede nedlastinger, alle programtilleggene, Wikipedia, Wikivoyage og mye mer.</string>
     <string name="quick_action_edit_actions">Rediger handlinger</string>
-    <string name="error_notification_desc">Send en skjeravbildning av dette varselet til support@osmand.net</string>
+    <string name="error_notification_desc">Send en skjermavbildning av denne merknaden til support@osmand.net</string>
     <string name="coord_input_edit_point">Rediger punkt</string>
     <string name="coord_input_add_point">Legg til punkt</string>
     <string name="coord_input_save_as_track">Lagre som spor</string>
@@ -3544,4 +3544,8 @@
     <string name="map_markers_item">Kartmarkører</string>
     <string name="measure_distance_item">Mål avstand</string>
     <string name="travel_item">Reising (Wikivoyage og Wikipedia)</string>
+    <string name="navigation_profiles_item">Navigasjonsprofiler</string>
+    <string name="quick_action_transport_hide">Skjul offentlig transport</string>
+    <string name="quick_action_transport_show">Vis offentlig transport</string>
+    <string name="back_to_editing">Tilbake til redigering</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 3aa56077d0..591e033a49 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -3791,7 +3791,7 @@
     <string name="poi_resort_hunting">Ambona łowiecka</string>
     <string name="poi_dive_centre">Centrum nurkowania</string>
     <string name="poi_mountain_rescue">Ratownictwo górskie</string>
-    <string name="poi_monastery_type_clerks_regular">Typ klasztoru: urzędnicy regularni</string>
+    <string name="poi_monastery_type_clerks_regular">Typ klasztoru: zwykli duchowni</string>
     <string name="poi_sms">SMS</string>
     <string name="poi_video_telephone">Video</string>
     <string name="poi_sms_yes">Tak</string>
@@ -3818,4 +3818,9 @@
     <string name="poi_seamark_water_level_awash">Poziom wody: obmywający falami</string>
     <string name="poi_seamark_water_level_covers">Poziom wody: pokrywający</string>
     <string name="poi_internet_access_fee_customers">Dostęp do Internetu dla klientów</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Ssanie</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pod ciśnieniem</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">Woda podziemna</string>
+    <string name="poi_fire_hydrant_type_pipe">Rura</string>
+    <string name="poi_fire_hydrant_pressure_filter">Ciśnienie</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index 2145f702d1..d495167e0d 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -3627,7 +3627,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="divider_descr">Elementy poniżej tego punktu są oddzielone dzielnikiem.</string>
     <string name="shared_string_hidden">Ukryte</string>
     <string name="hidden_items_descr">Te elementy są ukryte w menu, jednak reprezentowane opcje i wtyczki będą wciąż działać.</string>
-    <string name="reset_items_descr">Ustawienia zostaną zrestetowane po schowaniu.</string>
+    <string name="reset_items_descr">Ukrycie ustawień resetuje je do pierwotnego stanu.</string>
     <string name="main_actions_descr">\"Główne czynności\" zawierają tylko 4 przyciski.</string>
     <string name="main_actions">Główne działania</string>
     <string name="move_inside_category">Możesz przemieszczać elementy tylko wewnątrz tej kategorii.</string>
@@ -3677,7 +3677,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
 \nMożesz wyłączyć nieużywane wtyczki, aby ukryć ich elementy w aplikacji %1$s.</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="search_poi_types">Szukaj typów użytecznych miejsc</string>
-    <string name="search_poi_types_descr">Łącz typy użytecznych zmian z różnych kategorii. Stuknij przełącznik, aby zaznaczyć wszystko, stuknij lewą stronę, aby wybrać kategorię.</string>
+    <string name="search_poi_types_descr">Łącz typy użytecznych zmian z różnych kategorii. Stuknij \"Zmień\", aby zaznaczyć wszystko, stuknij lewą stronę, aby wybrać kategorię.</string>
     <string name="legend_item_description">Przewodnik po symbolach mapy</string>
     <string name="navigation_profiles_item">Profile nawigacji</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
@@ -3689,4 +3689,27 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="favorites_item">Ulubione</string>
     <string name="subscription_osmandlive_item">Subskrypcja - OsmAnd Live</string>
     <string name="osmand_purchases_item">Zakupy w OsmAnd</string>
+    <string name="osm_live_payment_subscription_management">Opłaty z twojego konta Google Play są pobierane przy zakupie subskrypcji
+\ni po jej wygaśnięciu (miesiąc/trzy miesiące/rok),
+\nnie odnowi się, jeśli zostanie wcześniej anulowana w ustawieniach Google Play.</string>
+    <string name="release_3_7">• Nowe mapy stoków offline
+\n
+\n • Pełna personalizacja Ulubionych i Punktów GPX - niestandardowe kolory, ikony, kształty
+\n
+\n • Dostosowywanie kolejności elementów w menu kontekstowym, konfiguracji mapy, menu podręcznym
+\n
+\n • Wikipedia jako osobna warstwa w konfiguracji mapy, wybierz tylko potrzebne języki
+\n
+\n • Tworzenie własnego filtru użytecznych miejsc/mapy z pełną elastycznością
+\n
+\n • Dodano opcje przywracania ustawień profili niestandardowych
+\n
+\n • Pełne trasy GPX z nawigacji obsługują pasy ruchu i pełne instrukcje skrętu
+\n
+\n • Naprawiono rozmiary interfejsu użytkownika na tabletach
+\n
+\n • Naprawiono błędy z RTL
+\n
+\n</string>
+    <string name="back_to_editing">Powrót do edycji</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index afcc80e13b..a14bb519bb 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -3818,4 +3818,9 @@
     <string name="poi_drinking_water_refill_yes">Recarga de água potável: sim</string>
     <string name="poi_drinking_water_refill_no">Recarga de água potável: não</string>
     <string name="poi_drinking_water_refill_network">Rede de recarga de água potável</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Sucção</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Pressurizado</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">Água subterrânea</string>
+    <string name="poi_fire_hydrant_type_pipe">Tubo</string>
+    <string name="poi_fire_hydrant_pressure_filter">Pressão</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index bc16fce3fe..73b9ee0a82 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -1996,7 +1996,7 @@ Pôr do Sol: %2$s</string>
     <string name="date_added">Adicionado</string>
     <string name="order_by">Ordenar por:</string>
     <string name="marker_show_distance_descr">Selecionar como indicar distância e orientação para marcadores de mapa no mapa:</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Selecione a velocidade em que a orientação muda de \'Na direção do movimento\' para \'Na direção da bússola\'.</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Selecione a velocidade em que a orientação muda de \'Na direção do movimento\' para \'direção da bússola\'.</string>
     <string name="all_markers_moved_to_history">Todos os marcadores de mapa foram movidas para o histórico</string>
     <string name="marker_moved_to_history">O marcador de mapa foi movido para o histórico</string>
     <string name="marker_moved_to_active">O marcador de mapa foi movido para ativo</string>
@@ -3570,7 +3570,7 @@ Pôr do Sol: %2$s</string>
     <string name="recalculate_route_in_deviation">Recalcular rota em caso de desvio</string>
     <string name="shared_string_terrain">Terreno</string>
     <string name="hillshade_description">Mapa de sombras de relevo usando tons escuros para mostrar encostas, picos e planícies.</string>
-    <string name="slope_description">A inclinação é visualizações coloridas no terreno.</string>
+    <string name="slope_description">A inclinação usa cores para visualizar a inclinação do terreno.</string>
     <string name="terrain_slider_description">Defina os níveis mínimo e máximo de zoom nos quais a camada será exibida.</string>
     <string name="hillshade_download_description">Mapas adicionais são necessários para visualizar sombras de relevo no mapa.</string>
     <string name="slope_download_description">Mapas adicionais são necessários para visualizar as Inclinações no mapa.</string>
@@ -3578,7 +3578,7 @@ Pôr do Sol: %2$s</string>
     <string name="shared_string_transparency">Transparência</string>
     <string name="shared_string_zoom_levels">Níveis de zoom</string>
     <string name="shared_string_legend">Legenda</string>
-    <string name="terrain_empty_state_text">Ative para visualizar mapa de colinas ou declives. Você pode ler mais sobre esses tipos de mapa em nosso site</string>
+    <string name="terrain_empty_state_text">Ativar para visualizar mapa de colinas ou declives. Você pode ler mais sobre esses tipos de mapa em nosso site.</string>
     <string name="shared_string_hillshade">Sombras de relevo</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Encostas</string>
@@ -3599,7 +3599,7 @@ Pôr do Sol: %2$s</string>
     <string name="custom_osmand_plugin">Plug-in OsmAnd personalizado</string>
     <string name="replace_point_descr">Substitua outro ponto por este</string>
     <string name="changes_applied_to_profile">Alterações aplicadas ao perfil \'%1$s\'.</string>
-    <string name="settings_item_read_error">"Não foi possível ler a partir de  \'%1$s\'."</string>
+    <string name="settings_item_read_error">Não foi possível ler a partir de \'%1$s\'.</string>
     <string name="settings_item_write_error">Não foi possível escrever para \'%1$s\'.</string>
     <string name="settings_item_import_error">Não foi possível importar de \'%1$s\'.</string>
     <string name="select_track_file">Selecionar arquivo de faixa</string>
@@ -3658,9 +3658,11 @@ Pôr do Sol: %2$s</string>
     <string name="extra_maps_menu_group">Mapas extras</string>
     <string name="download_unsupported_action">Ação não suportada %1$s</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
-    <string name="osm_live_payment_subscription_management">Sua conta do Google Play é cobrada mediante a compra de uma assinatura
-\ne quando expirar (mês/três meses/ano),
-\nele não será renovado se for cancelado antes pelas configurações do Google Play.</string>
+    <string name="osm_live_payment_subscription_management">O pagamento será cobrado na sua conta do Google Play na confirmação da compra.
+\n
+\n  A assinatura é renovada automaticamente, a menos que seja cancelada antes da data de renovação. Sua conta será cobrada pelo período de renovação (mês/três meses/ano) somente na data de renovação.
+\n
+\n  Você pode gerenciar e cancelar suas assinaturas acessando as configurações do Google Play.</string>
     <string name="search_poi_types">Pesquisar tipos de POI</string>
     <string name="search_poi_types_descr">Combine tipos de PIs de diferentes categorias. Toque em \"Alternar\" para selecionar todos, toque no lado esquerdo para selecionar a categoria.</string>
     <string name="tracker_item">Rastreador do OsmAnd</string>
@@ -3675,4 +3677,33 @@ Pôr do Sol: %2$s</string>
     <string name="osmand_purchases_item">Compras de OsmAnd</string>
     <string name="legend_item_description">O guia para a simbologia de um mapa</string>
     <string name="navigation_profiles_item">Perfis de navegação</string>
+    <string name="release_3_7">• Novos mapas de inclinação offline
+\n
+\n  • Personalização completa de Favoritos e Waypoints GPX - cores, ícones e formas personalizados
+\n
+\n  • Personalize a ordem dos itens no menu de contexto, configurar mapa, gaveta
+\n
+\n  • Wikipédia como uma camada separada no mapa Configurar, selecione apenas os idiomas necessários
+\n
+\n  • Crie seu próprio filtro / mapa de POI com total flexibilidade
+\n
+\n  • Adicionadas opções para restaurar configurações de perfis personalizados
+\n
+\n  • Rotas GPX completas das faixas de tráfego da Navigation Support e instruções completas de curva
+\n
+\n  • Corrigir tamanhos de interface do usuário em tablets
+\n
+\n  • Corrija bugs com RTL
+\n
+\n</string>
+    <string name="additional_actions_descr">Você pode acessar essas ações tocando no botão “%1$s”.</string>
+    <string name="quick_action_transport_hide">Ocultar transporte público</string>
+    <string name="quick_action_transport_show">Mostrar transporte público</string>
+    <string name="quick_action_show_hide_transport">Mostrar/ocultar transporte público</string>
+    <string name="quick_action_transport_descr">Um botão para mostrar ou ocultar o transporte público no mapa.</string>
+    <string name="create_edit_poi">Criar/Editar POI</string>
+    <string name="parking_positions">Posições de estacionamento</string>
+    <string name="add_edit_favorite">Adicionar / Editar favorito</string>
+    <string name="reset_deafult_order">Restaurar ordem de itens padrão</string>
+    <string name="back_to_editing">Voltar à edição</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml
index ab074fb484..5817148f0d 100644
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@@ -3139,17 +3139,17 @@
     <string name="poi_government_transportation">Транспортное учреждение</string>
     <string name="poi_government_legislative">Законодательное учреждение</string>
     <string name="poi_surface_clay">Глина</string>
-    <string name="poi_location_underground">Местонахождение: под землёй</string>
-    <string name="poi_location_underwater">Местонахождение: под водой</string>
-    <string name="poi_location_overground">Местонахождение: над землёй</string>
-    <string name="poi_location_overhead">Местонахождение: наверху</string>
-    <string name="poi_location_roof">Местонахождение: крыша</string>
-    <string name="poi_location_outdoor">Местонахождение: на открытом воздухе</string>
-    <string name="poi_location_indoor">Местонахождение: в помещении</string>
-    <string name="poi_location_platform">Местонахождение: на платформе</string>
-    <string name="poi_location_bridge">Местонахождение: на мосту</string>
-    <string name="poi_location_wall">Местонахождение: на стене</string>
-    <string name="poi_location_entrance">Местонахождение: у входа</string>
+    <string name="poi_location_underground">Расположение: под землёй</string>
+    <string name="poi_location_underwater">Расположение: под водой</string>
+    <string name="poi_location_overground">Расположение: над землёй</string>
+    <string name="poi_location_overhead">Расположение: наверху</string>
+    <string name="poi_location_roof">Расположение: крыша</string>
+    <string name="poi_location_outdoor">Расположение: на открытом воздухе</string>
+    <string name="poi_location_indoor">Расположение: в помещении</string>
+    <string name="poi_location_platform">Расположение: на платформе</string>
+    <string name="poi_location_bridge">Расположение: на мосту</string>
+    <string name="poi_location_wall">Расположение: на стене</string>
+    <string name="poi_location_entrance">Расположение: у входа</string>
     <string name="poi_visibility_house">Видимость: дом</string>
     <string name="poi_visibility_street">Видимость: улица</string>
     <string name="poi_visibility_area">Видимость: площадь</string>
@@ -3519,7 +3519,7 @@
     <string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
     <string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
     <string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
-    <string name="poi_socket_schuko_yes">Schuko</string>
+    <string name="poi_socket_schuko_yes">Защитный контакт</string>
     <string name="poi_socket_bs1363_yes">BS 1363</string>
     <string name="poi_socket_as3112_yes">AS/NZS 3112</string>
     <string name="poi_socket_chademo_output_filter">Выход: CHAdeMO</string>
@@ -3717,7 +3717,7 @@
     <string name="poi_paintball">Пейнтбол</string>
     <string name="poi_glacier_type_tidewater">Ледник, спускающийся в море</string>
     <string name="poi_glacier_type_outlet">Выводной ледник</string>
-    <string name="poi_location_kiosk">Местонахождение: в киоске</string>
+    <string name="poi_location_kiosk">Расположение: киоск</string>
     <string name="poi_drink_wine_retail">Вино: розничная продажа</string>
     <string name="poi_dive_centre">Центр подводного плавания с аквалангом</string>
     <string name="poi_resort_hunting">Охотничья база</string>
@@ -3753,4 +3753,16 @@
     <string name="poi_motorcycle_permissive">С разрешения</string>
     <string name="poi_hgv_permissive">С разрешения</string>
     <string name="poi_seamark_obstruction">Препятствие</string>
+    <string name="poi_climbing_toprope_no">Верхняя верёвка: нет</string>
+    <string name="poi_climbing_toprope_yes">Верхняя верёвка: есть</string>
+    <string name="poi_monastery_type_clerks_regular">Тип монастыря: обычный клерикальный</string>
+    <string name="poi_monastery_type_hermitage">Тип монастыря: скит</string>
+    <string name="poi_monastery_type_canonry">Тип монастыря: канонический</string>
+    <string name="poi_monastery_type_convent">Тип монастыря: женский монастырь</string>
+    <string name="poi_monastery_type_monastics">Тип монастыря: монашество</string>
+    <string name="poi_shop_security">Магазин защиты и безопасности</string>
+    <string name="poi_mountain_rescue">Горноспасательная станция</string>
+    <string name="poi_internet_access_fee_customers">Сигнал для поиска полюса</string>
+    <string name="poi_climbing_multipitch_no">Многоуровневые маршруты: нет</string>
+    <string name="poi_climbing_multipitch_yes">Многоуровневые маршруты: есть</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 69c05fb366..9ed8a72760 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -3276,7 +3276,7 @@
     <string name="shared_string_memory_used_tb_desc">Использовано %1$s ТБ</string>
     <string name="shared_string_memory_used_gb_desc">Использовано %1$s ГБ</string>
     <string name="shared_string_memory_used_mb_desc">Использовано %1$s МБ</string>
-    <string name="shared_string_memory_used_kb_desc">Использовано %1$s кБ</string>
+    <string name="shared_string_memory_used_kb_desc">Использовано %1$s КБ</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Предпочитать грунтовые дороги</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Предпочитать дороги без покрытия.</string>
     <string name="shared_string_other">Прочее</string>
@@ -3294,7 +3294,7 @@
     <string name="shared_string_memory_tb_desc">%1$s ТБ</string>
     <string name="shared_string_memory_gb_desc">%1$s ГБ</string>
     <string name="shared_string_memory_mb_desc">%1$s МБ</string>
-    <string name="shared_string_memory_kb_desc">%1$s кБ</string>
+    <string name="shared_string_memory_kb_desc">%1$s КБ</string>
     <string name="track_storage_directory">Папка для хранения треков</string>
     <string name="track_storage_directory_descrp">Треки могут храниться в папке «rec», или в ежемесячных, или ежедневных папках.</string>
     <string name="store_tracks_in_rec_directory">Записывать треки в папку «rec»</string>
@@ -3447,7 +3447,7 @@
 \n 
 \n• Добавлен номер съезда в навигации 
 \n 
-\n• Переработаны настройки плагина 
+\n• Переработаны настройки плагинов 
 \n 
 \n• Переработан экран настроек для быстрого доступа ко всем профилям 
 \n 
@@ -3455,7 +3455,7 @@
 \n 
 \n• Добавлена возможность изменить порядок или скрыть категории POI в поиске 
 \n 
-\n• Правильно выровненные значки POI на карте 
+\n• Правильно выровнены значки POI на карте 
 \n 
 \n• Добавлены данные захода/восхода солнца для настройки карты 
 \n 
@@ -3465,8 +3465,8 @@
 \n 
 \n• Добавлена корректная транслитерация на карте Японии 
 \n 
-\n• Добавлена карта Антарктиды 
-\n 
+\n• Добавлена карта Антарктиды
+\n
 \n</string>
     <string name="copy_coordinates">Копировать координаты</string>
     <string name="please_provide_profile_name_message">Укажите имя профиля</string>
@@ -3580,7 +3580,7 @@
     <string name="n_items_of_z">%1$s из %2$s</string>
     <string name="terrain_slider_description">Настройка минимального и максимального уровней масштабирования, при которых слой будет отображаться.</string>
     <string name="quick_action_show_hide_terrain">Показать/скрыть рельеф</string>
-    <string name="quick_action_terrain_descr">Кнопка для отображения или скрытия слоя рельефа местности на карте.</string>
+    <string name="quick_action_terrain_descr">Переключатель, чтобы отобразить или скрыть слой рельефа местности на карте.</string>
     <string name="quick_action_terrain_show">Показать рельеф</string>
     <string name="quick_action_terrain_hide">Скрыть рельеф</string>
     <string name="shared_string_terrain">Рельеф</string>
@@ -3600,7 +3600,7 @@
     <string name="live_monitoring_adress_descr">Укажите веб-адрес со следующими параметрами: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
     <string name="monitoring_min_accuracy_descr">В этом случае будут записываться только точки, измеренные с минимальной точностью (в метрах/футах согласно настройкам устройства). Точность относится к разбросу повторяющихся измерений и не связана непосредственно с точностью, которая определяет, насколько ваши измерения близки к вашему истинному положению.</string>
     <string name="monitoring_min_speed_descr_recommendation">Рекомендация: попробуйте сначала воспользоваться детектором движения через фильтр минимального смещения (B), что может дать лучшие результаты и вы потеряете меньше данных. Если треки остаются шумными на низких скоростях, попробуйте использовать ненулевые значения. Обратите внимание, что некоторые измерения могут вообще не указывать значения скорости (некоторые сетевые методы), и в этом случае ничего не будет записываться.</string>
-    <string name="slope_description">Склон выделяется цветовой визуализацией на рельефе местности.</string>
+    <string name="slope_description">Склон использует цвета для визуализации крутизны.</string>
     <string name="slope_read_more">Подробнее о склонах можно прочитать в %1$s.</string>
     <string name="shared_string_hillshade">Затенение рельефа</string>
     <string name="hillshade_description">Затенение рельефа использует тёмные оттенки для отображения склонов, вершин и низменностей.</string>
@@ -3668,7 +3668,9 @@
     <string name="download_unsupported_action">Неподдерживаемое действие %1$s</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="osm_live_payment_subscription_management">Оплата будет списана со счёта, привязанного к вашему аккаунту Google Play, при подтверждении покупки. 
+\n
 \nПодписка продлевается автоматически, если вы не отмените её до даты продления. С вашего счёта будет взиматься плата за период продления (месяц/три месяца/год) разово в день продления. 
+\n
 \nВы можете управлять подписками и отменять их в настройках Google Play.</string>
     <string name="search_poi_types_descr">Можно объединить типы POI из разных категорий. Нажмите «Переключить», чтобы выбрать все; нажмите слева, чтобы выбрать категорию.</string>
     <string name="search_poi_types">Поиск типов POI</string>
@@ -3684,4 +3686,33 @@
     <string name="legend_item_description">Справка по символике карты</string>
     <string name="favorites_item">Избранное</string>
     <string name="navigation_profiles_item">Профили навигации</string>
+    <string name="release_3_7">• Новые автономные карты склонов
+\n
+\n • Полная настройка избранных и путевых точек GPX: пользовательские цвета, значки, формы
+\n
+\n • Изменение порядка элементов в контекстном меню, настройках карты, панели
+\n
+\n • Википедия как отдельный слой в настройках карты, можно выбрать только нужные языки
+\n
+\n • Можно создать собственный очень гибкий фильтр POI/карты
+\n
+\n • Добавлены параметры для восстановления настроек пользовательских профилей
+\n
+\n • Полные GPX-маршруты в «Навигации» с поддержкой полос движения и подробными инструкциями поворотов
+\n
+\n • Исправлены размеры интерфейса на планшетах
+\n
+\n • Исправлены ошибки для языков, пишущихся справа налево
+\n
+\n</string>
+    <string name="additional_actions_descr">Доступ к этим действиям можно получить, нажав кнопку «%1$s».</string>
+    <string name="quick_action_transport_hide">Скрыть общественный транспорт</string>
+    <string name="quick_action_transport_show">Показать общественный транспорт</string>
+    <string name="quick_action_show_hide_transport">Показать/скрыть общественный транспорт</string>
+    <string name="add_edit_favorite">Добавить/редактировать избранные</string>
+    <string name="create_edit_poi">Создать/редактировать POI</string>
+    <string name="back_to_editing">Возврат к редактированию</string>
+    <string name="parking_positions">Место стоянки</string>
+    <string name="quick_action_transport_descr">Переключатель, чтобы отобразить или скрыть общественный транспорт на карте.</string>
+    <string name="reset_deafult_order">Восстановить исходный порядок</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index fa74fb82d5..2bf2c09f7f 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -3687,4 +3687,23 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="osmand_purchases_item">Còmporas de OsmAnd</string>
     <string name="legend_item_description">Sa ghia pro sa simbologia de sa mapa</string>
     <string name="navigation_profiles_item">Profilos de navigatzione</string>
+    <string name="release_3_7">• Mapas noas non in lìnia de sas pendèntzias
+\n
+\n • Peronalizazione intrea de sos preferidos e de sos puntos de coladòrgiu - colores, iconas e formas personalizados
+\n
+\n • Personaliza s\'oòrdine de sos elementos in su Menù de cuntestu, in Cunfigura mapa e in su Calàssiu
+\n
+\n • Wikipedia comente un\'istratu a banda in Cunfigura mapa, in ue podes ischertare petzi sas limbas chi cheres
+\n
+\n • Crea su filtru tuo/sa mapa tua cun sos PDI cun una flessibilidade totale
+\n
+\n • Optzione pro ripristinare sas impostatziones pro sos profilos personalizados annànghida
+\n
+\n • Àndalas GPX intreas cun suportu pro sa navigatzione, corsias de tzirculatzione eistrutzione de bortada cumpridas
+\n
+\n • Mannària de interfache gràfica in sas tauleddas acontzadas
+\n
+\n • Faddinas cun RTL acontzadas
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index bbcdfa64aa..9097274a83 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -3679,4 +3679,23 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="osmand_purchases_item">Nákupy v OsmAnd</string>
     <string name="legend_item_description">Sprievodca symbolmi na mape</string>
     <string name="navigation_profiles_item">Navigačné profily</string>
+    <string name="release_3_7">• Nové offline mapy svahov
+\n
+\n • Plné prispôsobenie Obľúbených a bodov GPX – vlastné farby, ikony a tvary
+\n
+\n • Možnosť prispôsobenia poradia položiek v kontextovom menu, nastavení mapy a úvodnom paneli
+\n
+\n • Wikipédia ako samostatná vrstva v nastavení mapy, možnosť vybrať iba potrebné jazyky
+\n
+\n • Vytvorte vlastné filtre bodov záujmu s veľkou flexibilitou
+\n
+\n • Pridané možnosti na obnovenie nastavení pre vlastné profily
+\n
+\n • Plné trasy GPX z navigácie podporujú jazdné pruhy a navigačné pokyny
+\n
+\n • Oprava veľkostí používateľského rozhrania na tabletoch
+\n
+\n • Opravy chýb pre jazyky písané sprava doľava
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 758a7d2422..6ef7aeb99a 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -2419,7 +2419,7 @@
     <string name="avoid_pt_types_descr">Kaçınılacak toplu taşıma türlerini seçin:</string>
     <string name="quick_action_day_night_mode">%s modu</string>
     <string name="avoid_pt_types">Kaçınılacak taşıma türleri…</string>
-    <string name="shared_string_walk">Yürü</string>
+    <string name="shared_string_walk">Yürüme</string>
     <string name="public_transport_warning_title">Toplu taşıma navigasyonu şu anda beta testindedir, hatalar ve yanlışlıklar olabilir.</string>
     <string name="add_intermediate">Ara nokta ekle</string>
     <string name="add_start_and_end_points">Kalkış ve varış noktası ekle</string>
@@ -2919,7 +2919,7 @@
     <string name="shared_string_launch">Başlat</string>
     <string name="lang_gn_py">Guaraní dili</string>
     <string name="intermediate_waypoint">Ara nokta</string>
-    <string name="transfers">Transferler</string>
+    <string name="transfers">Aktarmalar</string>
     <string name="on_foot">Yürüyerek</string>
     <string name="route_way">Yol</string>
     <string name="points_of_interests">İlgi çekici noktalar (Points of interest - POI)</string>
@@ -2979,7 +2979,7 @@
 \n
 \n</string>
     <string name="files_present">%1$d dosya (%2$s) önceki \'%3$s\' konumunda mevcut.</string>
-    <string name="public_transport_ped_route_title">Yürüme rotası yaklaşık %1$s\'dir ve toplu taşıma araçlarına göre daha hızlı olabilir</string>
+    <string name="public_transport_ped_route_title">Yürüme rotası yaklaşık %1$s, ve toplu taşıma araçlarına göre daha hızlı olabilir</string>
     <string name="public_transport_no_route_title">Ne yazık ki, OsmAnd ayarlarınıza uygun bir rota bulamadı.</string>
     <string name="searching_gps">GPS aranıyor</string>
     <string name="coordinates_widget">Koordinatlar widget\'ı</string>
@@ -3630,7 +3630,7 @@
 \ndolduğunda (ay/üç ay/yıl) ücretlendirilir,
 \nGoogle Play ayarlarınızdan daha önce iptal edilirse yenilenmeyecektir.</string>
     <string name="search_poi_types">POI türleri ara</string>
-    <string name="search_poi_types_descr">Farklı kategorilerdeki POI türlerini birleştirin. Tümünü seçmek için düğmeye dokunun, kategori seçimi için sol tarafa dokunun.</string>
+    <string name="search_poi_types_descr">Farklı kategorilerdeki POI türlerini birleştirin. Tümünü seçmek için \"Değiştir\" düğmesine, kategori seçimi için sol tarafa dokunun.</string>
     <string name="radius_ruler_item">Yarıçap cetveli</string>
     <string name="tracker_item">OsmAnd izleyici</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
@@ -3643,4 +3643,23 @@
     <string name="osmand_purchases_item">OsmAnd satın almaları</string>
     <string name="legend_item_description">Bir haritadaki sembollerin rehberi</string>
     <string name="navigation_profiles_item">Navigasyon profilleri</string>
+    <string name="release_3_7">• Yeni çevrim dışı Yamaç haritaları
+\n
+\n • Sık Kullanılanlar ve GPX Ara Noktalarını tamamen özelleştirme – özel renkler, simgeler, şekiller
+\n
+\n • İçerik Menüsü, Harita Yapılandırma, Çekmece ögelerinin sırasını özelleştirme
+\n
+\n • Harita yapılandırma bölümünde ayrı bir katman olarak Wikipedia, yalnızca gerekli dilleri seçin
+\n
+\n • Tamamen esnek olarak kendi POI filtrenizi/haritalarınızı oluşturun
+\n
+\n • Özel profiller için ayarları geri yükleme seçenekleri eklendi
+\n
+\n • GPX rota navigasyonu için trafik şeritleri ve dönüş talimatları için tam destek
+\n
+\n • Tabletlerde kullanıcı arayüzü boyutlarını düzeltme
+\n
+\n • RTL hatalarını düzeltme
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-uk/phrases.xml b/OsmAnd/res/values-uk/phrases.xml
index e8efef8da1..9ec1f28a2b 100644
--- a/OsmAnd/res/values-uk/phrases.xml
+++ b/OsmAnd/res/values-uk/phrases.xml
@@ -3806,4 +3806,8 @@
     <string name="poi_drinking_water_refill_yes">Поповнення питної води: так</string>
     <string name="poi_drinking_water_refill_no">Поповнення питної води: ні</string>
     <string name="poi_drinking_water_refill_network">Мережа поповнення питної води</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Під тиском</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Всмоктування</string>
+    <string name="poi_fire_hydrant_type_pipe">Труба</string>
+    <string name="poi_fire_hydrant_pressure_filter">Тиск</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index c7f4c63438..e04519295e 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -26,12 +26,12 @@
     <string name="unknown_location">Розташування ще не визначено.</string>
     <string name="modify_transparency">Встановити прозорість (0 – прозорий, 255 – непрозорий)</string>
     <string name="confirm_interrupt_download">Скасувати завантаження\?</string>
-    <string name="first_time_msg">Дякуємо за використання OsmAnd. Завантажуйте регіональні дані для використання в автономному режимі за допомогою пункту меню \'Налаштування\' → \'Управління мапами\' для перегляду мап, пошуку адрес, POI, громадського транспорту тощо.</string>
+    <string name="first_time_msg">Дякуємо за користування OsmAnd. Завантажуйте регіональні дані для користування в автономному режимі за допомогою пункту меню \'Налаштування\' → \'Керування мапами\' для перегляду мап, пошуку адрес, POI, громадського транспорту тощо.</string>
     <string name="basemap_was_selected_to_download">Основна мапа, необхідна для забезпечення основних можливостей, знаходиться у черзі завантаження.</string>
     <string name="select_index_file_to_download">Нічого не знайдено. Якщо Ви не знайшли свій регіон, Ви можете створити його самостійно (див. https://osmand.net).</string>
     <string name="local_indexes_cat_tile">Мережеві та кешовані растрові мапи</string>
     <string name="local_indexes_cat_map">Стандартні мапи (векторні)</string>
-    <string name="index_settings_descr">Завантаження, перегляд подробиць та управління локальними мапами.</string>
+    <string name="index_settings_descr">Завантаження, перегляд подробиць та керування локальними мапами.</string>
     <string name="map_online_plugin_is_not_installed">Увімкніть втулок \'Мережеві мапи\', щоб вибирати різні джерела мап</string>
     <string name="map_online_data">Мережеві мапи (растрові)</string>
     <string name="map_online_data_descr">Використовувати мережеві мапи (завантажити та кешувати плитки на карті пам\'яті).</string>
@@ -162,7 +162,7 @@
     <string name="routing_settings">Навігація</string>
     <string name="routing_settings_descr">Визначити налаштування навігації.</string>
     <string name="global_settings">Загальні налаштування</string>
-    <string name="index_settings">Управління мапами</string>
+    <string name="index_settings">Керування мапами</string>
     <string name="general_settings">Загальні</string>
     <string name="general_settings_descr">Налаштуйте відображення та загальні параметри застосунку.</string>
     <string name="global_app_settings">Загальні налаштування</string>
@@ -243,7 +243,7 @@
     <string name="local_index_items_restored">%1$d з %2$d об’єктів задіяно.</string>
     <string name="local_index_no_items_to_do">Нема об’єктів в %1$s</string>
     <string name="local_index_action_do">Ви дійсно хочете вилучити %1$s %2$s об’єктів?</string>
-    <string name="local_index_descr_title">Управління мапами.</string>
+    <string name="local_index_descr_title">Керування мапами.</string>
     <string name="local_index_mi_restore">Задіяти</string>
     <string name="local_index_mi_backup">Знедіяти</string>
     <string name="shared_string_download">Завантажити</string>
@@ -910,7 +910,7 @@
     <string name="map_widget_transparent">Прозорі віджети</string>
     <string name="int_continuosly">Безперервно</string>
     <string name="map_widget_view_direction">Напрямок</string>
-    <string name="support_new_features_descr">Пожертвування для реалізації нових можливостей в застосунку.</string>
+    <string name="support_new_features_descr">Внески для реалізації нових можливостей в застосунку.</string>
     <string name="email">e-mail</string>
     <string name="map_widget_gps_info">GPS дані</string>
     <string name="layer_recordings">Шар записів</string>
@@ -1891,15 +1891,15 @@
 \n(Наразі вільно лише {2} МБ.)</string>
     <string name="download_files_question_space_with_temp">Завантажити {0} файл(ів)\? 
 \nВикористовується {3} МБ тимчасового сховища та {1} МБ постійного. (Із {2} МБ.)</string>
-    <string name="donations">Пожертвування</string>
-    <string name="osm_live_subscribe_btn">Підписатися</string>
+    <string name="donations">Внески</string>
+    <string name="osm_live_subscribe_btn">Передплатити</string>
     <string name="osm_live_hide_user_name">Не показувати моє ім’я у звітах</string>
     <string name="osm_live_month_cost">Щомісячна вартість</string>
     <string name="osm_live_month_cost_desc">Щомісячний платіж</string>
     <string name="osm_live_active">Задіяно</string>
     <string name="osm_live_not_active">Незадіяно</string>
     <string name="osm_live_enter_email">Будь ласка, введіть дійсну електронну адресу</string>
-    <string name="osm_live_subscription_settings">Налаштування підписки</string>
+    <string name="osm_live_subscription_settings">Налаштування передплати</string>
     <string name="select_map_marker">Вибрати позначку на мапі</string>
     <string name="upload_anonymously">Вивантажено анонімно</string>
     <string name="show_transparency_seekbar">Показати прозору пошукову панель</string>
@@ -1952,7 +1952,7 @@
     <string name="number_of_recipients">Кількість одержувачів</string>
     <string name="osm_user_stat">Правки %1$s, ранг %2$s, всього правок %3$s</string>
     <string name="osm_editors_ranking">Рейтинг землеписців OSM</string>
-    <string name="osm_live_subscription">Підписка OsmAnd Live</string>
+    <string name="osm_live_subscription">Передплата OsmAnd Live</string>
     <string name="osm_live_email_desc">Це потрібно, щоб надавати Вам відомості про зміни на мапі.</string>
     <string name="osm_live_user_public_name">Прилюдне імʼя</string>
     <string name="osm_live_support_region">Територія</string>
@@ -1960,7 +1960,7 @@
     <string name="osm_live_thanks">Дякуємо за підтримку OsmAnd! 
 \nЩоб задіяти усі нові можливості Вам потрібно перезапустити застосунок.</string>
     <string name="osm_live_region_desc">Частина коштів буде спрямована землеписцям OSM, що внесли зміни до мапи в цьому місці.</string>
-    <string name="osm_live_ask_for_purchase">Будь ласка, спочатку придбайте підписку OsmAnd Live</string>
+    <string name="osm_live_ask_for_purchase">Будь ласка, спочатку передплатіть OsmAnd Live</string>
     <string name="osm_live_header">Передплата дозволяє щогодини отримувати оновлення для мап по всьому світу. 
 \nЧастина від передплати переводиться спільноті OSM та виплачується кожному землеписцю за його внесок. 
 \nЯкщо Вам подобається OsmAnd та OSM, і хочете підтримати і бути підтриманими ними, це ідеальний спосіб зробити це.</string>
@@ -2042,10 +2042,10 @@
     <string name="delete_filter">Вилучити фільтр</string>
     <string name="new_filter">Новий фільтр</string>
     <string name="new_filter_desc">Введіть назву для нового фільтра. Ви зможете його знайти у списку категорій.</string>
-    <string name="osm_live_payment_desc">Абонентська плата стягується щомісячно. Скасувати підписку можна в Google Play у будь-який момент.</string>
-    <string name="donation_to_osm">Пожертва для спільноти OSM</string>
-    <string name="donation_to_osm_desc">Частина Вашого пожертвування надсилається до OSM-вкладників. Вартість передплати залишається однаковою.</string>
-    <string name="osm_live_subscription_desc">Підписка включає в себе щогодинні, щоденні і щотижневі оновлення, а також необмежену кількість доступних завантажень для усіх мап з усього світу.</string>
+    <string name="osm_live_payment_desc">Передплата стягується щомісячно. Скасувати передплату можна в Google Play у будь-який момент.</string>
+    <string name="donation_to_osm">Допомога спільноті OSM</string>
+    <string name="donation_to_osm_desc">Частина вашої допомоги надсилається до OSM-вкладників. Вартість передплати залишається однаковою.</string>
+    <string name="osm_live_subscription_desc">Передплата включає щогодинні, щоденні та щотижневі оновлення, а також, необмежену кількість доступних завантажень для всіх мап з усього світу.</string>
     <string name="get_it">Отримати</string>
     <string name="get_for">Отримати на %1$s</string>
     <string name="osm_live_banner_desc">Отримайте необмежені завантаження для мап, а також оновлення мап частіше ніж один раз на місяць: щотижня, щодня або щогодини.</string>
@@ -2511,7 +2511,7 @@
     <string name="do_not_use_animations_descr">Вимикає анімації мапи.</string>
     <string name="marker_show_distance_descr">Вибрати як показувати відстань і напрямок до позначок на мапі:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Поріг орієнтації мапи</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Виберіть нижче, на якій швидкості орієнтація мапи перемикається зі „за напрямком руху“ на „за компасом“.</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Виберіть далі, на якій швидкості орієнтація мапи перемикається із \'за напрямком руху\' на \'за компасом\'.</string>
     <string name="all_markers_moved_to_history">Усі позначки перенесено до історії</string>
     <string name="marker_moved_to_history">Позначку мапи перенесено до історії</string>
     <string name="marker_moved_to_active">Позначка мапи стала задіяною</string>
@@ -2571,7 +2571,7 @@
     <string name="import_as_gpx">Імпортувати як GPX-файл</string>
     <string name="import_as_favorites">Імпортувати як закладки</string>
     <string name="import_file">Імпортувати файл</string>
-    <string name="tap_on_map_to_hide_interface_descr">Дотик на мапі змінює кнопки управління та віджети.</string>
+    <string name="tap_on_map_to_hide_interface_descr">Дотик на мапі змінює кнопки керування та віджети.</string>
     <string name="tap_on_map_to_hide_interface">Повноекранний режим</string>
     <string name="mark_passed">Позначити пройденим</string>
     <string name="digits_quantity">Кількість десяткових цифр</string>
@@ -2634,7 +2634,7 @@
     <string name="shared_string_marker">Позначка</string>
     <string name="osm_recipient_stat">Редагувань %1$s, сума %2$s mBTC</string>
     <string name="osm_recipients_label">OSM-одержувачі</string>
-    <string name="total_donations">Всього пожертвувань</string>
+    <string name="total_donations">Всього внесків</string>
     <string name="day_off_label">вих.</string>
     <string name="winter_and_ski_renderer">Зимовий/лижний</string>
     <string name="touring_view_renderer">Туристичний вигляд</string>
@@ -2711,10 +2711,10 @@
     <string name="default_render_descr">Стиль загального призначення. Густі міста показані чисто. Особливості горизонталей, маршрутів, якості поверхні, обмеження доступу, дорожні щити, надання доріжок за шкалою SAC, пункти біловодних видів спорту.</string>
     <string name="open_wikipedia_link_online">Відкрити посилання Вікіпедії в мережі</string>
     <string name="open_wikipedia_link_online_description">Посилання буде відкрите в веб-браузері.</string>
-    <string name="read_wikipedia_offline_description">Отримайте підписку на OsmAnd Live, щоб читати статті з Вікіпедії та Вікімандрів в автономному режимі.</string>
+    <string name="read_wikipedia_offline_description">Передплатіть OsmAnd Live, щоб читати статті з Вікіпедії та Вікімандрів в автономному режимі.</string>
     <string name="read_wikipedia_offline">Читати Вікіпедію в автономному режимі</string>
-    <string name="purchase_cancelled_dialog_title">Ви скасували підписку на OsmAnd Live</string>
-    <string name="purchase_cancelled_dialog_descr">Відновіть підписку, щоб продовжити використовувати усі функції:</string>
+    <string name="purchase_cancelled_dialog_title">Ви скасували передплату OsmAnd Live</string>
+    <string name="purchase_cancelled_dialog_descr">Поновіть передплату, щоб продовжити користуватися усіма функціями:</string>
     <string name="maps_you_need_descr">Зважаючи на збережені вами статті, ми рекомендуємо завантажити наступні мапи:</string>
     <string name="maps_you_need">Потрібні вам мапи</string>
     <string name="osmand_team">Команда OsmAnd</string>
@@ -2725,7 +2725,7 @@
     <string name="update_is_available">Доступне оновлення</string>
     <string name="download_file">Завантажити файл</string>
     <string name="start_editing_card_image_text">Безкоштовний всесвітній путівник, який може редагувати кожен.</string>
-    <string name="welcome_to_open_beta_description">Туристичні путівники в даний час засновані на Вікімандрах. Перевірте усі функції безкоштовно під час відкритого бета-тестування. Потім путівники будуть доступні передплатникам OsmAnd Unlimited і власникам OsmAnd+.</string>
+    <string name="welcome_to_open_beta_description">Туристичні путівники, в цей час, засновані на Вікімандрах. Перевірте усі функції безплатно під час відкритого бета-тестування. Потім, путівники будуть доступні передплатникам OsmAnd Unlimited і власникам OsmAnd+.</string>
     <string name="start_editing_card_description">Вам можна і слід редагувати будь-яку статтю на Вікімандрах. Діліться знаннями, досвідом, талантом і Вашої увагою.</string>
     <string name="start_editing">Розпочати редагування</string>
     <string name="get_unlimited_access">Отримати необмежений доступ</string>
@@ -2852,7 +2852,7 @@
     <string name="osm_live_payment_month_cost_descr">%1$s / місяць</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / місяць</string>
     <string name="osm_live_payment_discount_descr">Заощадьте %1$s</string>
-    <string name="osm_live_payment_current_subscription">Поточна підписка</string>
+    <string name="osm_live_payment_current_subscription">Поточна передплата</string>
     <string name="osm_live_payment_renews_monthly">Оновлюється щомісяця</string>
     <string name="osm_live_payment_renews_quarterly">Оновлюється щокварталу</string>
     <string name="osm_live_payment_renews_annually">Оновлюється щороку</string>
@@ -2894,7 +2894,7 @@
     <string name="voice_announcements">Голосові оголошення</string>
     <string name="intermediate_destinations">Проміжні пункти призначення</string>
     <string name="arrive_at_time">Прибуття о %1$s</string>
-    <string name="osm_live_subscriptions">Підписки</string>
+    <string name="osm_live_subscriptions">Передплати</string>
     <string name="mapillary_menu_title_pano">Відображати лише панорами 360°</string>
     <string name="shared_string_launch">Запуск</string>
     <string name="lang_gn_py">Гуарані</string>
@@ -3225,7 +3225,7 @@
     <string name="get_discount_first_part">%1$s за перший %2$s</string>
     <string name="get_discount_first_few_part">%1$s за перші %2$s</string>
     <string name="get_discount_second_part">далі %1$s</string>
-    <string name="cancel_subscription">Скасувати підписку</string>
+    <string name="cancel_subscription">Скасувати передплату</string>
     <string name="price_and_discount">%1$s • Заощадити %2$s</string>
     <string name="configure_profile_info">Налаштування для профілю:</string>
     <string name="shared_string_example">Приклад</string>
@@ -3577,7 +3577,7 @@
     <string name="shared_string_min">Хв</string>
     <string name="shared_string_terrain">Місцевість</string>
     <string name="hillshade_description">Мапа пагорбів використовує темні відтінки для показу схилів, вершин і низин.</string>
-    <string name="slope_description">Схил - це кольорове відмальовування на місцевості.</string>
+    <string name="slope_description">У режимі Схил, рельєф місцевості візуалізується за допомогою кольорів.</string>
     <string name="terrain_slider_description">Встановіть найменший та найбільший рівні масштабування, при якому шар буде відображатися.</string>
     <string name="hillshade_download_description">Потрібні додаткові мапи для перегляду пагорбів.</string>
     <string name="slope_download_description">Для перегляду схилів потрібні додаткові мапи.</string>
@@ -3585,7 +3585,7 @@
     <string name="shared_string_transparency">Прозорість</string>
     <string name="shared_string_zoom_levels">Рівні масштабування</string>
     <string name="shared_string_legend">Позначення</string>
-    <string name="terrain_empty_state_text">Увімкнути для перегляду мапи пагорбів або схилів. Докладніше про ці види мап Ви можете прочитати на нашому сайті</string>
+    <string name="terrain_empty_state_text">Увімкнути для перегляду мапи пагорбів або схилів. Докладніше про ці види мап Ви можете прочитати на нашому сайті.</string>
     <string name="shared_string_hillshade">Пагорб</string>
     <string name="n_items_of_z">%1$s з %2$s</string>
     <string name="download_slope_maps">Схили</string>
@@ -3674,4 +3674,43 @@
     <string name="map_markers_item">Позначки</string>
     <string name="favorites_item">Закладки</string>
     <string name="subscription_osmandlive_item">Передплата - OsmAnd Live</string>
+    <string name="osmand_purchases_item">OsmAnd покупки</string>
+    <string name="legend_item_description">Довідник умовних позначень мапи</string>
+    <string name="osm_live_payment_subscription_management">Оплата буде списана з рахунку, прив\'язаного до вашого облікового запису Google Play, при підтвердженні придбання. 
+\n
+\nПередплата продовжується автоматично, якщо ви не скасуєте її до дати продовження. З вашого рахунку буде стягуватися плата за період продовження (щомісяця/щотримісяці/щорік) разово в день продовження. 
+\n
+\nВи можете керувати передплатами та скасовувати їх у налаштуваннях Google Play.</string>
+    <string name="search_poi_types">Пошук видів POI</string>
+    <string name="search_poi_types_descr">Поєднуйте види POI з різних категорій. Торкніться \"Переключити\", щоб вибрати все, торкніться лівої сторони для вибору категорії.</string>
+    <string name="navigation_profiles_item">Профілі навігації</string>
+    <string name="release_3_7">• Нові безмережеві мапи схилів
+\n
+\n • Повне налаштування вибраних та GPX шляхових точок - спеціальні кольори, значки, форми
+\n
+\n • Налаштування порядку елементів у контекстному меню, Налаштувати мапу, панелі
+\n
+\n • Вікіпедія як окремий шар у Налаштувати мапу, вибір лише потрібних мов
+\n
+\n • Створіть власний фільтр POI/мапи з цілковитою гнучкістю
+\n
+\n • Додані параметри для відновлення налаштувань для користувацьких профілів
+\n
+\n • Повні маршрути GPX з Навігації підтримують смуги руху та повні вказівки повороту
+\n
+\n • Виправлено розміри інтерфейсу на планшетах
+\n
+\n • Виправлено помилки для мов що пишуться справа наліво
+\n
+\n</string>
+    <string name="parking_positions">Розташування припаркованого авто</string>
+    <string name="quick_action_transport_hide">Приховати громадський транспорт</string>
+    <string name="quick_action_transport_show">Показати громадський транспорт</string>
+    <string name="quick_action_show_hide_transport">Показати/приховати громадський транспорт</string>
+    <string name="quick_action_transport_descr">Кнопка показу або приховування громадського транспорту на мапі.</string>
+    <string name="create_edit_poi">Створити/змінити POI</string>
+    <string name="add_edit_favorite">Додати / редагувати вибране</string>
+    <string name="reset_deafult_order">Відновити типовий порядок елементів</string>
+    <string name="back_to_editing">Повернутися до редагування</string>
+    <string name="additional_actions_descr">Ви можете отримати доступ до цих дій, торкнувшись кнопки “%1$s”.</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 125c8998ff..8b77862f31 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2903,7 +2903,7 @@
     <string name="by_transport_type">由 %1$s</string>
     <string name="step_by_step">按步驟</string>
     <string name="routeInfo_road_types_name">道路類型</string>
-    <string name="exit_at">出口於</string>
+    <string name="exit_at">離開於</string>
     <string name="sit_on_the_stop">站點的座位</string>
     <string name="quick_action_show_hide_gpx_tracks">顯示／隱藏 GPX 軌跡</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">在地圖上顯示或隱藏所選 GPX 軌跡的按鈕。</string>
@@ -3679,4 +3679,23 @@
     <string name="osmand_purchases_item">OsmAnd 購買</string>
     <string name="legend_item_description">地圖符號系統指南</string>
     <string name="navigation_profiles_item">導航設定檔</string>
+    <string name="release_3_7">• 新的離線坡度圖
+\n
+\n • 對收藏與 GPX 路徑點的完整自訂能力 — 自訂顏色、圖示、形狀
+\n
+\n • 自訂情境選單、設定地圖、抽屜中的項目順序
+\n
+\n • 設定地圖中可將維基百科選取為單獨的圖層，並僅選取需要的語言
+\n
+\n • 在超強的彈性下建立您自己的 POI 過濾器／地圖
+\n
+\n • 新增選項以恢復自訂設定檔中的選項
+\n
+\n • 對 GPX 路徑導航完整支援車道與轉彎提示
+\n
+\n • 修復平板電腦上的使用者介面大小
+\n
+\n • 修復 RTL 的臭蟲
+\n
+\n</string>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 2e5579853d..8bc2b87c03 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -130,6 +130,7 @@
 		<attr name="dlg_btn_stroked" format="reference" />
 		<attr name="profile_save_btn" format="reference"/>
 		<attr name="profile_cancel_btn" format="reference"/>
+		<attr name="btn_bg_border_inactive" format="reference"/>
 	</declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index 0e4b376cc1..1b2bf04c81 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -133,6 +133,7 @@
 	<string name="poi_volcano_status">Status</string>
 	<string name="poi_sms">SMS</string>
 	<string name="poi_video_telephone">Video</string>
+	<string name="poi_fire_hydrant_pressure_filter">Pressure</string>
 
 <!--  categories -->
 	<string name="poi_shop">Store</string>
@@ -4221,5 +4222,10 @@
 	<string name="poi_drinking_water_refill_no">Drinking water refill: no</string>
 	<string name="poi_drinking_water_refill_network">Drinking water refill network</string>
 
+	<string name="poi_fire_hydrant_type_pipe">Pipe</string>
+	<string name="poi_fire_hydrant_style_water_source_groundwater">Groundwater</string>
+
+	<string name="poi_osmand_fire_hydrant_pressure_pressurized">Pressurized</string>
+	<string name="poi_osmand_fire_hydrant_pressure_suction">Suction</string>
 
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 96545aabed..f48398fb63 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -376,4 +376,5 @@
 	<dimen name="list_item_move_header_min_height">65dp</dimen>
 
 	<dimen name="download_description_images_height">132dp</dimen>
+	<dimen name="info_description_line_spacing_multiplier" format="float">1.4</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 1b938c7b4c..9e0ae82623 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="quick_action_switch_profile_descr">Taping action button will switch between selected profiles.</string>
     <string name="back_to_editing">Back to editing</string>
     <string name="reset_deafult_order">Restore default items order</string>
-    <string name="shared_string_add_edit">Add / Edit Favorite</string>
+    <string name="add_edit_favorite">Add / Edit Favorite</string>
     <string name="parking_positions">Parking positions</string>
     <string name="create_edit_poi">Create/Edit POI</string>
     <string name="quick_action_transport_descr">A button to show or hide public transport on the map.</string>
@@ -141,7 +141,7 @@
     <string name="shared_string_import_complete">Import complete</string>
     <string name="import_complete_description">All data from the %1$s is imported, you can use buttons below to open needed part of the app to manage it.</string>
     <string name="shared_string_hillshade">Hillshade</string>
-    <string name="terrain_empty_state_text">Enable to view hillshade or slope map. You can read more about this map types on our site</string>
+    <string name="terrain_empty_state_text">Enable to view hillshade or slope map. You can read more about these map types on our site.</string>
     <string name="shared_string_legend">Legend</string>
     <string name="shared_string_zoom_levels">Zoom levels</string>
     <string name="shared_string_transparency">Transparency</string>
@@ -149,7 +149,7 @@
     <string name="slope_download_description">Additional maps are needed to view Slopes on the map.</string>
     <string name="hillshade_download_description">Additional maps are needed to view Hillshade on the map.</string>
     <string name="terrain_slider_description">Set the minimum and maximum zoom levels at which the layer will be displayed.</string>
-    <string name="slope_description">Slope is colorized visualisations on terrain.</string>
+    <string name="slope_description">Slope uses colors to visualize terrain steepness.</string>
     <string name="hillshade_description">Hillshade map using dark shades to show slopes, peaks and lowlands.</string>
     <string name="shared_string_terrain">Terrain</string>
     <string name="import_rendering_file">Import rendering file</string>
@@ -728,7 +728,7 @@
     <string name="work_button">Work</string>
     <string name="cubic_m">m³</string>
     <string name="metric_ton">t</string>
-    <string name="shared_string_capacity">Сapacity</string>
+    <string name="shared_string_capacity">Capacity</string>
     <string name="shared_string_width">Width</string>
     <string name="shared_string_height">Height</string>
     <string name="add_destination_point">Set destination</string>
@@ -1049,7 +1049,7 @@
     <string name="order_by">Order by:</string>
     <string name="marker_show_distance_descr">Select how to indicate distance and direction to map markers on the map:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Map orientation threshold</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Select speed of switching orientation from \'Movement direction\' to \'Compass directon\' below.</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Select speed of switching orientation from \'Movement direction\' to \'Compass direction\' below.</string>
     <string name="all_markers_moved_to_history">All map markers moved to history</string>
     <string name="marker_moved_to_history">Map marker moved to history</string>
     <string name="marker_moved_to_active">Map marker moved to active</string>
@@ -1298,6 +1298,7 @@
     <string name="trip_rec_notification_settings">Turn on quick recording</string>
     <string name="trip_rec_notification_settings_desc">Display a system notification allowing trip recording.</string>
     <string name="shared_string_notifications">Notifications</string>
+    <string name="shared_string_resume">Resume</string>
     <string name="shared_string_continue">Continue</string>
     <string name="shared_string_pause">Pause</string>
     <string name="shared_string_paused">Paused</string>
@@ -2116,8 +2117,8 @@
     <string name="live_monitoring_m">Online tracking (GPX required)</string>
     <string name="live_monitoring_start">Start online tracking</string>
     <string name="live_monitoring_stop">Stop online tracking</string>
-    <string name="gpx_monitoring_start">Start GPX logging</string>
-    <string name="gpx_monitoring_stop">Stop GPX logging</string>
+    <string name="gpx_monitoring_start">Resume GPX logging</string>
+    <string name="gpx_monitoring_stop">Pause GPX logging</string>
     <string name="gpx_start_new_segment">Start new segment</string>
     <string name="rendering_attr_hideBuildings_name">Buildings</string>
     <string name="rendering_attr_hideNonVehicleHighways_name">Non-vehicle highways</string>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 3c0411b035..468bdfe57d 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -286,10 +286,11 @@
         <item name="android:colorBackgroundFloating">@color/list_background_color_light</item>
         <item name="preferenceTheme">@style/OsmandPreferenceTheme</item>
         <item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_light</item>
+        <item name="btn_bg_border_inactive">@drawable/btn_bg_border_inactive_light</item>
     </style>
 
     <style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_overflow_menu_white</item>
+        <item name="srcCompat">@drawable/ic_overflow_menu_white</item>
     </style>
 
     <style name="PopupMenuLight" parent="@style/Widget.AppCompat.Light.PopupMenu">
@@ -554,6 +555,7 @@
         <item name="android:colorBackgroundFloating">@color/list_background_color_dark</item>
         <item name="preferenceTheme">@style/OsmandPreferenceTheme</item>
         <item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_dark</item>
+        <item name="btn_bg_border_inactive">@drawable/btn_bg_border_inactive_dark</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">
diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index be5aa79e6c..ecc1d82aea 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -52,6 +52,7 @@ import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.core.text.TextUtilsCompat;
@@ -353,13 +354,7 @@ public class AndroidUtils {
 	}
 
 	public static void setBackground(Context ctx, View view, boolean night, int lightResId, int darkResId) {
-		Drawable drawable;
-		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-			drawable = ctx.getResources().getDrawable(night ? darkResId : lightResId, ctx.getTheme());
-		} else {
-			drawable = ctx.getResources().getDrawable(night ? darkResId : lightResId);
-		}
-		setBackground(view, drawable);
+		setBackground(view, AppCompatResources.getDrawable(ctx, night ? darkResId : lightResId));
 	}
 
 	public static void setBackground(View view, Drawable drawable) {
@@ -372,19 +367,18 @@ public class AndroidUtils {
 
 	public static void setForeground(Context ctx, View view, boolean night, int lightResId, int darkResId) {
 		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
-			view.setForeground(ctx.getResources().getDrawable(night ? darkResId : lightResId,
-					ctx.getTheme()));
+			view.setForeground(AppCompatResources.getDrawable(ctx, night ? darkResId : lightResId));
 		} else if (view instanceof FrameLayout) {
-			((FrameLayout) view).setForeground(ctx.getResources().getDrawable(night ? darkResId : lightResId));
+			((FrameLayout) view).setForeground(AppCompatResources.getDrawable(ctx, night ? darkResId : lightResId));
 		}
 	}
 
 	public static void updateImageButton(Context ctx, ImageButton button, int iconLightId, int iconDarkId, int bgLightId, int bgDarkId, boolean night) {
-		button.setImageDrawable(ctx.getResources().getDrawable(night ? iconDarkId : iconLightId));
+		button.setImageDrawable(AppCompatResources.getDrawable(ctx, night ? iconDarkId : iconLightId));
 		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-			button.setBackground(ctx.getResources().getDrawable(night ? bgDarkId : bgLightId, ctx.getTheme()));
+			button.setBackground(AppCompatResources.getDrawable(ctx, night ? bgDarkId : bgLightId));
 		} else {
-			button.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDarkId : bgLightId));
+			button.setBackgroundDrawable(AppCompatResources.getDrawable(ctx, night ? bgDarkId : bgLightId));
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java b/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
index 30fa5381c6..661f16bb73 100644
--- a/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
+++ b/OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
@@ -11,10 +11,10 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.fragment.app.FragmentActivity;
 
 import net.osmand.plus.OsmandApplication;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.MapActivity;
@@ -82,9 +82,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		OsmandApplication app = getMyApplication();
-		OsmandSettings settings = app.getSettings();
-		FragmentActivity activity = getActivity();
+		OsmandApplication app = requireMyApplication();
+		FragmentActivity activity = requireActivity();
 
 		RelativeLayout view = new RelativeLayout(activity);
 		view.setOnClickListener(null);
@@ -93,9 +92,9 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 		ImageView logo = new ImageView(getContext());
 		logo.setId(LOGO_ID);
 		if (Version.isFreeVersion(app)) {
-			logo.setImageDrawable(getResources().getDrawable(R.drawable.ic_logo_splash_osmand));
+			logo.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.ic_logo_splash_osmand));
 		} else if (Version.isPaidVersion(app) || Version.isDeveloperVersion(app)) {
-			logo.setImageDrawable(getResources().getDrawable(R.drawable.ic_logo_splash_osmand_plus));
+			logo.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.ic_logo_splash_osmand_plus));
 		}
 		RelativeLayout.LayoutParams logoLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
 		logoLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
@@ -105,17 +104,17 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 		text.setId(TEXT_ID);
 		if (Version.isFreeVersion(app)) {
 			if (InAppPurchaseHelper.isSubscribedToLiveUpdates(app)) {
-				text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_osmlive));
+				text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand_osmlive));
 			} else if (InAppPurchaseHelper.isFullVersionPurchased(app)) {
-				text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_inapp));
+				text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand_inapp));
 			} else {
-				text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand));
+				text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand));
 			}
 		} else if (Version.isPaidVersion(app) || Version.isDeveloperVersion(app)) {
 			if (InAppPurchaseHelper.isSubscribedToLiveUpdates(app)) {
-				text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_plus_osmlive));
+				text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand_plus_osmlive));
 			} else {
-				text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_plus));
+				text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand_plus));
 			}
 		}
 		RelativeLayout.LayoutParams textLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
@@ -124,7 +123,7 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
 		
 		ImageView osmText = new ImageView(activity);
 		osmText.setId(OSM_TEXT_ID);
-		osmText.setImageDrawable(getResources().getDrawable(R.drawable.image_text_openstreetmap));
+		osmText.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_openstreetmap));
 		RelativeLayout.LayoutParams osmTextLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
 		osmTextLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
 		osmTextLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 48bfff7a4d..17633b0720 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -65,10 +65,6 @@ public class ApplicationMode {
 	private ApplicationMode parentAppMode;
 	private int iconRes = R.drawable.ic_world_globe_dark;
 
-	private int minDistanceForTurn = 50;
-	private int arrivalDistance = 90;
-	private int offRouteDistance = 350;
-
 	private ApplicationMode(int key, String stringKey) {
 		this.keyName = key;
 		this.stringKey = stringKey;
@@ -78,21 +74,18 @@ public class ApplicationMode {
 	 * DEFAULT("Browse map"), CAR("Car"), BICYCLE("Bicycle"), PEDESTRIAN("Pedestrian"); NAUTICAL("boat"); PUBLIC_TRANSPORT("Public transport"); AIRCRAFT("Aircraft")
 	 */
 	public static final ApplicationMode DEFAULT = createBase(R.string.app_mode_default, "default")
-			.distanceForTurn(5).arrivalDistance(90)
 			.icon(R.drawable.ic_world_globe_dark).reg();
 
+
 	public static final ApplicationMode CAR = createBase(R.string.app_mode_car, "car")
-			.distanceForTurn(35)
 			.icon(R.drawable.ic_action_car_dark)
 			.description(R.string.base_profile_descr_car).reg();
 
 	public static final ApplicationMode BICYCLE = createBase(R.string.app_mode_bicycle, "bicycle")
-			.distanceForTurn(15).arrivalDistance(60).offRouteDistance(50)
 			.icon(R.drawable.ic_action_bicycle_dark)
 			.description(R.string.base_profile_descr_bicycle).reg();
 
 	public static final ApplicationMode PEDESTRIAN = createBase(R.string.app_mode_pedestrian, "pedestrian")
-			.distanceForTurn(5).arrivalDistance(45).offRouteDistance(20)
 			.icon(R.drawable.ic_action_pedestrian_dark)
 			.description(R.string.base_profile_descr_pedestrian).reg();
 
@@ -101,17 +94,14 @@ public class ApplicationMode {
 			.description(R.string.base_profile_descr_public_transport).reg();
 
 	public static final ApplicationMode BOAT = createBase(R.string.app_mode_boat, "boat")
-			.distanceForTurn(20)
 			.icon(R.drawable.ic_action_sail_boat_dark)
 			.description(R.string.base_profile_descr_boat).reg();
 
 	public static final ApplicationMode AIRCRAFT = createBase(R.string.app_mode_aircraft, "aircraft")
-			.distanceForTurn(100)
 			.icon(R.drawable.ic_action_aircraft)
 			.description(R.string.base_profile_descr_aircraft).reg();
 
 	public static final ApplicationMode SKI = createBase(R.string.app_mode_skiing, "ski")
-			.distanceForTurn(15).arrivalDistance(60).offRouteDistance(50)
 			.icon(R.drawable.ic_action_skiing)
 			.description(R.string.base_profile_descr_ski).reg();
 
@@ -314,9 +304,6 @@ public class ApplicationMode {
 	public void setParentAppMode(ApplicationMode parentAppMode) {
 		if (isCustomProfile()) {
 			this.parentAppMode = parentAppMode;
-			minDistanceForTurn = parentAppMode.minDistanceForTurn;
-			arrivalDistance = parentAppMode.arrivalDistance;
-			offRouteDistance = parentAppMode.offRouteDistance;
 			app.getSettings().PARENT_APP_MODE.setModeValue(this, parentAppMode.getStringKey());
 		}
 	}
@@ -369,15 +356,18 @@ public class ApplicationMode {
 	}
 
 	public int getMinDistanceForTurn() {
-		return minDistanceForTurn;
+		// used to be: 50 kmh - 35 m, 10 kmh - 15 m, 4 kmh - 5 m, 10 kmh - 20 m, 400 kmh - 100 m,
+		float speed = Math.max(getDefaultSpeed(), 0.3f);
+		// 2 sec + 7 m: 50 kmh - 35 m, 10 kmh - 12 m, 4 kmh - 9 m, 400 kmh - 230 m
+		return (int) (7 + speed * 2);
 	}
 
-	public int getArrivalDistance() {
-		return arrivalDistance;
-	}
 
 	public int getOffRouteDistance() {
-		return offRouteDistance;
+		// used to be: 50/14 - 350 m, 10/2.7 - 50 m, 4/1.11 - 20 m
+		float speed = Math.max(getDefaultSpeed(), 0.3f);
+		// become: 50 kmh - 280 m, 10 kmh - 55 m, 4 kmh - 22 m
+		return (int) (speed * 20);
 	}
 
 	public boolean hasFastSpeed() {
@@ -704,10 +694,6 @@ public class ApplicationMode {
 			values.add(applicationMode);
 
 			ApplicationMode parent = applicationMode.parentAppMode;
-			applicationMode.minDistanceForTurn = parent.minDistanceForTurn;
-			applicationMode.arrivalDistance = parent.arrivalDistance;
-			applicationMode.offRouteDistance = parent.offRouteDistance;
-
 			applicationMode.setParentAppMode(parent);
 			applicationMode.setUserProfileName(userProfileName);
 			applicationMode.setRouteService(routeService);
@@ -736,21 +722,6 @@ public class ApplicationMode {
 			return this;
 		}
 
-		public ApplicationModeBuilder distanceForTurn(int distForTurn) {
-			applicationMode.minDistanceForTurn = distForTurn;
-			return this;
-		}
-
-		public ApplicationModeBuilder arrivalDistance(int arrivalDistance) {
-			applicationMode.arrivalDistance = arrivalDistance;
-			return this;
-		}
-
-		public ApplicationModeBuilder offRouteDistance(int offRouteDistance) {
-			applicationMode.offRouteDistance = offRouteDistance;
-			return this;
-		}
-
 		public ApplicationModeBuilder setUserProfileName(String userProfileName) {
 			this.userProfileName = userProfileName;
 			return this;
diff --git a/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java b/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java
index 71ec956959..60964c99ad 100644
--- a/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/CustomOsmandPlugin.java
@@ -1,6 +1,7 @@
 package net.osmand.plus;
 
 import android.app.Activity;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -9,6 +10,7 @@ import android.text.Html;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
 import net.osmand.JsonUtils;
 import net.osmand.PlatformUtil;
@@ -104,7 +106,7 @@ public class CustomOsmandPlugin extends OsmandPlugin {
 			// called from UI
 			File pluginItemsFile = getPluginItemsFile();
 			if (pluginItemsFile.exists()) {
-				addPluginItemsFromFile(pluginItemsFile);
+				addPluginItemsFromFile(pluginItemsFile, activity);
 			}
 		}
 		return true;
@@ -212,7 +214,26 @@ public class CustomOsmandPlugin extends OsmandPlugin {
 		this.resourceDirName = resourceDirName;
 	}
 
-	private void addPluginItemsFromFile(final File file) {
+	private void addPluginItemsFromFile(final File file, final Activity activity) {
+		final ProgressDialog progress = new ProgressDialog(activity);
+		progress.setTitle(app.getString(R.string.loading_smth, ""));
+		progress.setMessage(app.getString(R.string.loading_data));
+		progress.setIndeterminate(true);
+		progress.setCancelable(false);
+
+		if (AndroidUtils.isActivityNotDestroyed(activity)) {
+			progress.show();
+		}
+
+		final SettingsHelper.SettingsImportListener importListener = new SettingsHelper.SettingsImportListener() {
+			@Override
+			public void onSettingsImportFinished(boolean succeed, @NonNull List<SettingsItem> items) {
+				if (AndroidUtils.isActivityNotDestroyed(activity)) {
+					progress.dismiss();
+				}
+			}
+		};
+
 		app.getSettingsHelper().collectSettings(file, "", 1, new SettingsCollectListener() {
 			@Override
 			public void onSettingsCollectFinished(boolean succeed, boolean empty, @NonNull List<SettingsItem> items) {
@@ -231,7 +252,7 @@ public class CustomOsmandPlugin extends OsmandPlugin {
 							item.setShouldReplace(true);
 						}
 					}
-					app.getSettingsHelper().importSettings(file, items, "", 1, null);
+					app.getSettingsHelper().importSettings(file, items, "", 1, importListener);
 				}
 			}
 		});
diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
index 1fa5479b2f..895c3a1d36 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java
@@ -25,6 +25,7 @@ import android.view.accessibility.AccessibilityManager;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 
@@ -162,15 +163,16 @@ public class OsmandApplication extends MultiDexApplication {
 	public void onCreate() {
 		long timeToStart = System.currentTimeMillis();
 		if (Version.isDeveloperVersion(this)) {
-			if (android.os.Build.VERSION.SDK_INT >= 9) {
-				try {
-					Class.forName("net.osmand.plus.base.EnableStrictMode").newInstance();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
+			try {
+				Class.forName("net.osmand.plus.base.EnableStrictMode").newInstance();
+			} catch (Exception e) {
+				e.printStackTrace();
 			}
 		}
 		super.onCreate();
+		if (Build.VERSION.SDK_INT < 21) {
+			AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+		}
 		createInUiThread();
 		uiHandler = new Handler();
 		appCustomization = new OsmAndAppCustomization();
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 980c824e75..b70668e34d 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -3795,9 +3795,6 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> SHOW_TRAVEL_UPDATE_CARD = new BooleanPreference("show_travel_update_card", true).makeGlobal();
 	public final OsmandPreference<Boolean> SHOW_TRAVEL_NEEDED_MAPS_CARD = new BooleanPreference("show_travel_needed_maps_card", true).makeGlobal();
 
-	public final ListStringPreference TRANSPORT_DEFAULT_SETTINGS =
-			(ListStringPreference) new ListStringPreference("transport_default_settings", "transportStops", ",").makeProfile();
-
 	public final ListStringPreference DISPLAYED_TRANSPORT_SETTINGS = (ListStringPreference)
 			new ListStringPreference("displayed_transport_settings", null, ",").makeProfile();
 	
diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java
index 30da1c855e..0c6cfe70c4 100644
--- a/OsmAnd/src/net/osmand/plus/UiUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java
@@ -30,6 +30,7 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
@@ -85,7 +86,7 @@ public class UiUtilities {
 		long hash = ((long) resId << 31l) + clrId;
 		Drawable d = drawableCache.get(hash);
 		if (d == null) {
-			d = ContextCompat.getDrawable(app, resId);
+			d = AppCompatResources.getDrawable(app, resId);
 			d = DrawableCompat.wrap(d);
 			d.mutate();
 			if (clrId != 0) {
@@ -100,7 +101,7 @@ public class UiUtilities {
 		long hash = ((long) resId << 31l) + color;
 		Drawable d = drawableCache.get(hash);
 		if (d == null) {
-			d = ContextCompat.getDrawable(app, resId);
+			d = AppCompatResources.getDrawable(app, resId);
 			d = tintDrawable(d, color);
 
 			drawableCache.put(hash, d);
@@ -149,7 +150,7 @@ public class UiUtilities {
 	public static Drawable getSelectableDrawable(Context ctx) {
 		int bgResId = AndroidUtils.resolveAttribute(ctx, R.attr.selectableItemBackground);
 		if (bgResId != 0) {
-			return ContextCompat.getDrawable(ctx, bgResId);
+			return AppCompatResources.getDrawable(ctx, bgResId);
 		}
 		return null;
 	}
@@ -168,7 +169,7 @@ public class UiUtilities {
 	}
 
 	public static Drawable createTintedDrawable(Context context, @DrawableRes int resId, int color) {
-		return tintDrawable(ContextCompat.getDrawable(context, resId), color);
+		return tintDrawable(AppCompatResources.getDrawable(context, resId), color);
 	}
 
 	public static Drawable tintDrawable(Drawable drawable, int color) {
@@ -525,15 +526,17 @@ public class UiUtilities {
 		int activeDisableColor = getColorWithAlpha(activeColor, 0.25f);
 		ColorStateList activeCsl = new ColorStateList(states,
 				new int[] {activeColor, activeDisableColor});
-		int inactiveColor = AndroidUtils.getColorFromAttr(ctx, R.attr.default_icon_color);
+		int inactiveColor = ContextCompat.getColor(ctx,
+				nightMode ? R.color.icon_color_default_dark : R.color.icon_color_secondary_light);
 		ColorStateList inactiveCsl = new ColorStateList(states,
 				new int[] {inactiveColor, inactiveColor});
 		slider.setTrackColorActive(activeCsl);
 		slider.setTrackColorInactive(inactiveCsl);
 		slider.setHaloColor(activeCsl);
 		slider.setThumbColor(activeCsl);
-		int ticksColor = showTicks ? ContextCompat.getColor(ctx,
-				nightMode ? R.color.color_black : R.color.color_white) :
+		int colorBlack = ContextCompat.getColor(ctx, R.color.color_black);
+		int ticksColor = showTicks ?
+				(nightMode ? colorBlack : getColorWithAlpha(colorBlack, 0.5f)) :
 				Color.TRANSPARENT;
 		slider.setTickColor(new ColorStateList(states, new int[] {ticksColor, ticksColor}));
 
@@ -592,7 +595,7 @@ public class UiUtilities {
 			buttonTextView.setTextColor(colorStateList);
 			buttonTextView.setEnabled(buttonView.isEnabled());
 			if (iconResId != INVALID_ID) {
-				Drawable icon = tintDrawable(ContextCompat.getDrawable(ctx, iconResId), ContextCompat.getColor(ctx, textAndIconColorResId));
+				Drawable icon = tintDrawable(AppCompatResources.getDrawable(ctx, iconResId), ContextCompat.getColor(ctx, textAndIconColorResId));
 				buttonTextView.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
 				buttonTextView.setCompoundDrawablePadding(AndroidUtils.dpToPx(ctx, ctx.getResources().getDimension(R.dimen.content_padding_half)));
 			}
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
index 2b9b50fd7c..71a8f7d345 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesListFragment.java
@@ -226,7 +226,7 @@ public class FavoritesListFragment extends OsmAndListFragment implements SearchA
 			}
 			if (!favorite.getCategory().isEmpty()) {
 				giImage.setVisibility(View.VISIBLE);
-				giImage.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_group));
+				giImage.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_group_name_16));
 			} else {
 				giImage.setVisibility(View.GONE);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java
index 7faf328dad..ab730d7485 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java
@@ -28,6 +28,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
@@ -319,7 +320,7 @@ public class FavoritesSearchFragment extends DialogFragment {
 			this.activity = activity;
 			this.helper = app.getFavorites();
 			location = app.getSettings().getLastKnownMapLocation();
-			arrowImage = ContextCompat.getDrawable(activity, R.drawable.ic_direction_arrow);
+			arrowImage = AppCompatResources.getDrawable(activity, R.drawable.ic_direction_arrow);
 			arrowImage.mutate();
 			arrowImage.setColorFilter(ContextCompat.getColor(activity, R.color.color_distance), PorterDuff.Mode.MULTIPLY);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 3b75326485..d44c8d4bf3 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -28,6 +28,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ActionMode;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.MenuItemCompat;
@@ -127,14 +128,14 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 		setAdapter(favouritesAdapter);
 
 		boolean light = getMyApplication().getSettings().isLightContent();
-		arrowImage = ContextCompat.getDrawable(context, R.drawable.ic_direction_arrow);
+		arrowImage = AppCompatResources.getDrawable(context, R.drawable.ic_direction_arrow);
 		arrowImage.mutate();
 		if (light) {
 			arrowImage.setColorFilter(ContextCompat.getColor(context, R.color.color_distance), PorterDuff.Mode.MULTIPLY);
 		} else {
 			arrowImage.setColorFilter(ContextCompat.getColor(context, R.color.color_distance), PorterDuff.Mode.MULTIPLY);
 		}
-		arrowImageDisabled = ContextCompat.getDrawable(context, R.drawable.ic_direction_arrow);
+		arrowImageDisabled = AppCompatResources.getDrawable(context, R.drawable.ic_direction_arrow);
 		arrowImageDisabled.mutate();
 		arrowImageDisabled.setColorFilter(ContextCompat.getColor(
 				context, light ? R.color.icon_color_default_light : R.color.icon_color_default_dark), PorterDuff.Mode.MULTIPLY);
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 7f950606dd..9da47a4bce 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -706,9 +706,10 @@ public class MapActivityActions implements DialogProvider {
 	public ContextMenuAdapter createMainOptionsMenu() {
 		final OsmandMapTileView mapView = mapActivity.getMapView();
 		final OsmandApplication app = mapActivity.getMyApplication();
-		ContextMenuAdapter optionsMenuHelper = new ContextMenuAdapter(app);
 		boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
-		
+		ContextMenuAdapter optionsMenuHelper = new ContextMenuAdapter(app);
+		optionsMenuHelper.setNightMode(nightMode);
+
 		if (drawerMode == DRAWER_MODE_SWITCH_PROFILE) {
 			return createSwitchProfileOptionsMenu(app, optionsMenuHelper, nightMode);
 		}
@@ -764,7 +765,7 @@ public class MapActivityActions implements DialogProvider {
 					}
 				})
 				.createItem());
-		
+
 		return optionsMenuHelper;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
index fb02ce19ea..e367f3cd8e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
@@ -16,9 +16,11 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
@@ -72,6 +74,8 @@ public class PluginActivity extends OsmandActionBarActivity  implements Download
 		if (pluginImage != null) {
 			ImageView img = (ImageView) findViewById(R.id.plugin_image);
 			img.setImageDrawable(pluginImage);
+		} else {
+			findViewById(R.id.plugin_image_placeholder).setVisibility(View.VISIBLE);
 		}
 
 		TextView descriptionView = (TextView) findViewById(R.id.plugin_description);
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
index ef012804df..6c86fad82d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchHistoryFragment.java
@@ -279,7 +279,7 @@ public class SearchHistoryFragment extends OsmAndListFragment implements SearchA
 		if (typeName != null && !typeName.isEmpty()) {
 			ImageView group = (ImageView) row.findViewById(R.id.type_name_icon);
 			group.setVisibility(View.VISIBLE);
-			group.setImageDrawable(ic.getThemedIcon(R.drawable.ic_small_group));
+			group.setImageDrawable(ic.getThemedIcon(R.drawable.ic_action_group_name_16));
 			((TextView) row.findViewById(R.id.type_name)).setText(typeName);
 		} else {
 			row.findViewById(R.id.type_name_icon).setVisibility(View.GONE);
@@ -290,15 +290,15 @@ public class SearchHistoryFragment extends OsmAndListFragment implements SearchA
 	public static int getItemIcon(PointDescription pd) {
 		int iconId;
 		if (pd.isAddress()) {
-			iconId = R.drawable.ic_type_address;
+			iconId = R.drawable.ic_action_street_name;
 		} else if (pd.isFavorite()) {
-			iconId = R.drawable.ic_type_favorites;
+			iconId = R.drawable.ic_action_favorite;
 		} else if (pd.isLocation()) {
-			iconId = R.drawable.ic_type_coordinates;
+			iconId = R.drawable.ic_action_marker_dark;
 		} else if (pd.isPoi()) {
-			iconId = R.drawable.ic_type_info;
+			iconId = R.drawable.ic_action_info_dark;
 		} else if (pd.isWpt()) {
-			iconId = R.drawable.ic_type_waypoint;
+			iconId = R.drawable.ic_action_flag_stroke;
 		} else if (pd.isAudioNote()) {
 			iconId = R.drawable.ic_type_audio;
 		} else if (pd.isVideoNote()) {
@@ -306,7 +306,7 @@ public class SearchHistoryFragment extends OsmAndListFragment implements SearchA
 		}else if (pd.isPhotoNote()) {
 			iconId = R.drawable.ic_type_img;
 		}  else {
-			iconId = R.drawable.ic_type_address;
+			iconId = R.drawable.ic_action_street_name;
 		}
 		return iconId;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
index 819600f085..84bbc4914a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
@@ -773,7 +773,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 
 					timeIcon.setVisibility(View.VISIBLE);
 					timeText.setVisibility(View.VISIBLE);
-					timeIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_small_time, colorId));
+					timeIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_time_16, colorId));
 					timeText.setTextColor(app.getResources().getColor(colorId));
 					String rt = rs.getCurrentRuleTime(inst);
 					timeText.setText(rt == null ? "" : rt);
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java
index 9fc75f7f5d..797667b886 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/SortByMenuBottomSheetDialogFragment.java
@@ -26,7 +26,7 @@ public class SortByMenuBottomSheetDialogFragment extends MenuBottomSheetDialogFr
 		items.add(new TitleItem(getString(R.string.shared_string_sort)));
 
 		BaseBottomSheetItem byTypeItem = new SimpleBottomSheetItem.Builder()
-				.setIcon(getContentIcon(R.drawable.ic_groped_by_type))
+				.setIcon(getContentIcon(R.drawable.ic_grouped_by_type))
 				.setTitle(getString(R.string.by_type))
 				.setLayoutId(R.layout.bottom_sheet_item_simple)
 				.setOnClickListener(new View.OnClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/adapters/NotesAdapter.java b/OsmAnd/src/net/osmand/plus/audionotes/adapters/NotesAdapter.java
index 278fdbd737..7fe810ee63 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/adapters/NotesAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/adapters/NotesAdapter.java
@@ -17,6 +17,7 @@ import androidx.core.content.ContextCompat;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.audionotes.AudioVideoNotesPlugin.Recording;
 import net.osmand.plus.audionotes.NotesFragment;
 
@@ -66,6 +67,8 @@ public class NotesAdapter extends ArrayAdapter<Object> {
 	@NonNull
 	@Override
 	public View getView(final int position, View row, @NonNull ViewGroup parent) {
+		boolean nightMode = !app.getSettings().isLightContent();
+		Context themedCtx = UiUtilities.getThemedContext(getContext(), nightMode);
 		if (portrait) {
 			final int type = getItemViewType(position);
 			boolean header = type == TYPE_DATE_HEADER
@@ -74,7 +77,7 @@ public class NotesAdapter extends ArrayAdapter<Object> {
 					|| type == TYPE_VIDEO_HEADER;
 
 			if (row == null) {
-				LayoutInflater inflater = (LayoutInflater) app.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+				LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
 				if (header) {
 					row = inflater.inflate(R.layout.list_item_header, parent, false);
 					HeaderViewHolder hHolder = new HeaderViewHolder(row);
@@ -97,16 +100,16 @@ public class NotesAdapter extends ArrayAdapter<Object> {
 
 			return row;
 		} else {
-			LayoutInflater inflater = (LayoutInflater) app.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
 			boolean lastCard = getCardsCount() == position + 1;
 			int margin = app.getResources().getDimensionPixelSize(R.dimen.content_padding);
 			int sideMargin = app.getResources().getDisplayMetrics().widthPixels / 10;
 
-			FrameLayout fl = new FrameLayout(getContext());
-			LinearLayout ll = new LinearLayout(getContext());
+			FrameLayout fl = new FrameLayout(themedCtx);
+			LinearLayout ll = new LinearLayout(themedCtx);
 			fl.addView(ll);
 			ll.setOrientation(LinearLayout.VERTICAL);
-			ll.setBackgroundResource(app.getSettings().isLightContent() ? R.drawable.bg_card_light : R.drawable.bg_card_dark);
+			ll.setBackgroundResource(nightMode ? R.drawable.bg_card_dark : R.drawable.bg_card_light);
 			((FrameLayout.LayoutParams) ll.getLayoutParams()).setMargins(sideMargin, margin, sideMargin, lastCard ? margin : 0);
 
 			if (position == 0 && hasShareLocationItem()) {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index 28155c664b..1b01f158be 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -137,7 +137,7 @@ public class DashFavoritesFragment extends DashLocationFragment {
 			ImageView groupImage = (ImageView)view.findViewById(R.id.group_image);
 			if (point.getCategory().length() > 0) {
 				((TextView) view.findViewById(R.id.group_name)).setText(point.getCategoryDisplayName(getMyApplication()));
-				groupImage.setImageDrawable(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_small_group));
+				groupImage.setImageDrawable(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_group_name_16));
 			} else {
 				groupImage.setVisibility(View.GONE);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index fca947ca37..2db0088ee9 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -32,6 +32,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 
 import androidx.annotation.ColorRes;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
@@ -236,7 +237,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 		listView.setDrawSelectorOnTop(true);
 		listView.setScrollViewCallbacks(this);
 		listEmptyTextView = (TextView) dashboardView.findViewById(R.id.emptyTextView);
-		gradientToolbar = ContextCompat.getDrawable(mapActivity, R.drawable.gradient_toolbar).mutate();
+		gradientToolbar = AppCompatResources.getDrawable(mapActivity, R.drawable.gradient_toolbar).mutate();
 		if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
 			this.portrait = true;
 			scrollView.setScrollViewCallbacks(this);
@@ -260,7 +261,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 			fl.gravity = Gravity.BOTTOM;
 			shadowContainer.setLayoutParams(fl);
 			ImageView shadow = new ImageView(mapActivity);
-			shadow.setImageDrawable(ContextCompat.getDrawable(mapActivity, R.drawable.bg_shadow_onmap));
+			shadow.setImageDrawable(AppCompatResources.getDrawable(mapActivity, R.drawable.bg_shadow_onmap));
 			shadow.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
 					FrameLayout.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM));
 			shadow.setScaleType(ScaleType.FIT_XY);
@@ -411,7 +412,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 
 
 		DashboardActionButton myLocationButton = new DashboardActionButton();
-		myLocationButton.icon = ContextCompat.getDrawable(mapActivity, R.drawable.map_my_location);
+		myLocationButton.icon = AppCompatResources.getDrawable(mapActivity, R.drawable.map_my_location);
 		myLocationButton.text = mapActivity.getString(R.string.map_widget_back_to_loc);
 		myLocationButton.onClickListener = new View.OnClickListener() {
 			@Override
@@ -426,7 +427,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 		};
 
 		DashboardActionButton navigateButton = new DashboardActionButton();
-		navigateButton.icon = ContextCompat.getDrawable(mapActivity, R.drawable.map_start_navigation);
+		navigateButton.icon = AppCompatResources.getDrawable(mapActivity, R.drawable.map_start_navigation);
 		navigateButton.text = mapActivity.getString(R.string.follow);
 		navigateButton.onClickListener = new View.OnClickListener() {
 			@Override
@@ -437,7 +438,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 		};
 
 		DashboardActionButton routeButton = new DashboardActionButton();
-		routeButton.icon = ContextCompat.getDrawable(mapActivity, R.drawable.map_directions);
+		routeButton.icon = AppCompatResources.getDrawable(mapActivity, R.drawable.map_directions);
 		routeButton.text = mapActivity.getString(R.string.layer_route);
 		routeButton.onClickListener = new View.OnClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
index 170cf9409e..9be9a5c69d 100644
--- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
@@ -62,7 +62,7 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin {
 			helper.addItem(new ContextMenuItem.ItemBuilder()
 					.setId(DRAWER_BUILDS_ID)
 					.setTitleId(R.string.version_settings, mapActivity)
-					.setIcon(R.drawable.ic_action_gabout_dark)
+					.setIcon(R.drawable.ic_action_info_dark)
 					.setListener(new ContextMenuAdapter.ItemClickListener() {
 						@Override
 						public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index bbf47785d2..a699646e06 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -38,7 +38,6 @@ import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
-import net.osmand.plus.OsmandSettings.OsmandPreference;
 import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.OsmandSettings.ListStringPreference;
 import net.osmand.plus.R;
@@ -100,7 +99,6 @@ import static net.osmand.aidlapi.OsmAndCustomizationConstants.ROUTES_ID;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.SHOW_CATEGORY_ID;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.TEXT_SIZE_ID;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.TRANSPORT_ID;
-import static net.osmand.aidlapi.OsmAndCustomizationConstants.TRANSPORT_RENDERING_ID;
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.WIKIPEDIA_ID;
 import static net.osmand.plus.ContextMenuAdapter.makeDeleteAction;
 import static net.osmand.plus.poi.PoiFiltersHelper.PoiTemplateList;
@@ -108,6 +106,7 @@ import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_DENSITY_ATTR;
 import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_ATTR;
 import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_LINES_SCHEME_ATTR;
 import static net.osmand.plus.srtmplugin.SRTMPlugin.CONTOUR_WIDTH_ATTR;
+import static net.osmand.plus.transport.TransportLinesMenu.RENDERING_CATEGORY_TRANSPORT;
 
 public class ConfigureMapMenu {
 	private static final Log LOG = PlatformUtil.getLog(ConfigureMapMenu.class);
@@ -141,7 +140,8 @@ public class ConfigureMapMenu {
 				ma.getDashboard().updateListAdapter(createListAdapter(ma));
 			}
 		});
-		List<RenderingRuleProperty> customRules = getCustomRules(app);
+		List<RenderingRuleProperty> customRules = getCustomRules(app,
+				RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN, RENDERING_CATEGORY_TRANSPORT);
 		adapter.setProfileDependent(true);
 		adapter.setNightMode(nightMode);
 		createLayersItems(customRules, adapter, ma, themeRes, nightMode);
@@ -149,16 +149,27 @@ public class ConfigureMapMenu {
 		return adapter;
 	}
 
-	public static List<RenderingRuleProperty> getCustomRules(OsmandApplication app) {
+	public static List<RenderingRuleProperty> getCustomRules(OsmandApplication app, String... skipCategories) {
 		RenderingRulesStorage renderer = app.getRendererRegistry().getCurrentSelectedRenderer();
+		if (renderer == null) {
+			return new ArrayList<>();
+		}
 		List<RenderingRuleProperty> customRules = new ArrayList<>();
 		boolean useDepthContours = app.getResourceManager().hasDepthContours()
 				&& (InAppPurchaseHelper.isSubscribedToLiveUpdates(app)
 				|| InAppPurchaseHelper.isDepthContoursPurchased(app));
-		if (renderer != null) {
-			for (RenderingRuleProperty p : renderer.PROPS.getCustomRules()) {
-				if (!RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(p.getCategory())
-						&& (useDepthContours || !p.getAttrName().equals("depthContours"))) {
+		for (RenderingRuleProperty p : renderer.PROPS.getCustomRules()) {
+			if (useDepthContours || !"depthContours".equals(p.getAttrName())) {
+				boolean skip = false;
+				if (skipCategories != null) {
+					for (String category : skipCategories) {
+						if (category.equals(p.getCategory())) {
+							skip = true;
+							break;
+						}
+					}
+				}
+				if (!skip) {
 					customRules.add(p);
 				}
 			}
@@ -396,14 +407,6 @@ public class ConfigureMapMenu {
 				.setItemDeleteAction(makeDeleteAction(settings.SHOW_POI_LABEL))
 				.setListener(l).createItem());
 
-		/*
-		ContextMenuItem item = createProperties(customRules, null, R.string.rendering_category_transport, R.drawable.ic_action_bus_dark,
-				"transport", settings.TRANSPORT_DEFAULT_SETTINGS, adapter, activity, false);
-		if (item != null) {
-			adapter.addItem(item);
-		}
-		*/
-
 		selected = TransportLinesMenu.isShowLines(app);
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setId(TRANSPORT_ID)
@@ -768,11 +771,6 @@ public class ConfigureMapMenu {
 				.setItemDeleteAction(makeDeleteAction(settings.MAP_PREFERRED_LOCALE))
 				.createItem());
 
-		props = createProperties(customRules, null, R.string.rendering_category_transport, R.drawable.ic_action_transport_bus,
-				"transport", null, adapter, activity, true, TRANSPORT_RENDERING_ID, themeRes, nightMode, selectedProfileColor);
-		if (props != null) {
-			adapter.addItem(props);
-		}
 		props = createProperties(customRules, null, R.string.rendering_category_details, R.drawable.ic_action_layers,
 				"details", null, adapter, activity, true, DETAILS_ID, themeRes, nightMode, selectedProfileColor);
 		if (props != null) {
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/PluginDisabledBottomSheet.java b/OsmAnd/src/net/osmand/plus/dialogs/PluginDisabledBottomSheet.java
index 50c0046c89..3a4b38e3b1 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/PluginDisabledBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/PluginDisabledBottomSheet.java
@@ -134,13 +134,15 @@ public class PluginDisabledBottomSheet extends MenuBottomSheetDialogFragment {
 
 	public static void showInstance(@NonNull FragmentManager fm, String pluginId, Boolean usedOnMap) {
 		try {
-			Bundle args = new Bundle();
-			args.putString(PLUGIN_ID_KEY, pluginId);
+			if (!fm.isStateSaved()) {
+				Bundle args = new Bundle();
+				args.putString(PLUGIN_ID_KEY, pluginId);
 
-			PluginDisabledBottomSheet dialog = new PluginDisabledBottomSheet();
-			dialog.setArguments(args);
-			dialog.setUsedOnMap(usedOnMap);
-			dialog.show(fm, PluginDisabledBottomSheet.TAG);
+				PluginDisabledBottomSheet dialog = new PluginDisabledBottomSheet();
+				dialog.setArguments(args);
+				dialog.setUsedOnMap(usedOnMap);
+				dialog.show(fm, PluginDisabledBottomSheet.TAG);
+			}
 		} catch (RuntimeException e) {
 			LOG.error("showInstance", e);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java b/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
index efeb56aaff..43abf6d515 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/PluginInstalledBottomSheetDialog.java
@@ -322,13 +322,15 @@ public class PluginInstalledBottomSheetDialog extends MenuBottomSheetDialogFragm
 
 	public static void showInstance(@NonNull FragmentManager fm, String pluginId, Boolean usedOnMap) {
 		try {
-			Bundle args = new Bundle();
-			args.putString(PLUGIN_ID_KEY, pluginId);
+			if (!fm.isStateSaved()) {
+				Bundle args = new Bundle();
+				args.putString(PLUGIN_ID_KEY, pluginId);
 
-			PluginInstalledBottomSheetDialog dialog = new PluginInstalledBottomSheetDialog();
-			dialog.setArguments(args);
-			dialog.setUsedOnMap(usedOnMap);
-			dialog.show(fm, PluginInstalledBottomSheetDialog.TAG);
+				PluginInstalledBottomSheetDialog dialog = new PluginInstalledBottomSheetDialog();
+				dialog.setArguments(args);
+				dialog.setUsedOnMap(usedOnMap);
+				dialog.show(fm, PluginInstalledBottomSheetDialog.TAG);
+			}
 		} catch (RuntimeException e) {
 			LOG.error("showInstance", e);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
index b5671e89c8..95631c9c8c 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
@@ -199,7 +199,7 @@ public class DownloadActivityType {
 		if (NORMAL_FILE == this) {
 			if (indexItem.fileName.endsWith(IndexConstants.BINARY_MAP_INDEX_EXT_ZIP)) {
 				return BINARY_MAP_INDEX_EXT;
-			} else if (indexItem.fileName.endsWith(IndexConstants.BINARY_MAP_INDEX_EXT_ZIP)) {
+			} else if (indexItem.fileName.endsWith(IndexConstants.BINARY_MAP_INDEX_EXT)) {
 				return BINARY_MAP_INDEX_EXT;
 			} else if (indexItem.fileName.endsWith(IndexConstants.EXTRA_ZIP_EXT)) {
 				return IndexConstants.EXTRA_EXT;
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java b/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
index 85771650e3..a712d03e76 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ColorDialogs.java
@@ -13,6 +13,8 @@ import android.widget.Spinner;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.drawable.DrawableCompat;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -235,9 +237,12 @@ public class ColorDialogs {
 	}
 
 	private static Drawable getIcon(final Context ctx, int resId, int color) {
-		Drawable d = ctx.getResources().getDrawable(resId).mutate();
-		d.clearColorFilter();
-		d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+		Drawable d = AppCompatResources.getDrawable(ctx, resId);
+		if (d != null) {
+			d = DrawableCompat.wrap(d).mutate();
+			d.clearColorFilter();
+			d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+		}
 		return d;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java b/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
index 6c7e6b924a..e7481eefb1 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
@@ -17,6 +17,7 @@ import android.view.View;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.AndroidNetworkUtils;
@@ -246,7 +247,7 @@ public class DiscountHelper {
 		int iconId = mapActivity.getResources().getIdentifier(data.iconId, "drawable", mapActivity.getMyApplication().getPackageName());
 		final DiscountBarController toolbarController = new DiscountBarController();
 		if (data.bgColor != -1) {
-			LayerDrawable bgLand = (LayerDrawable) ContextCompat.getDrawable(mapActivity, R.drawable.discount_bar_bg_land);
+			LayerDrawable bgLand = (LayerDrawable) AppCompatResources.getDrawable(mapActivity, R.drawable.discount_bar_bg_land);
 			if (bgLand != null) {
 				((GradientDrawable) bgLand.findDrawableByLayerId(R.id.color_bg)).setColor(data.bgColor);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
index efb435cc5e..3099ca7118 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
@@ -734,13 +734,13 @@ public class GpxUiHelper {
 			v.findViewById(R.id.unknown_section).setVisibility(View.GONE);
 			ImageView distanceI = (ImageView) v.findViewById(R.id.distance_icon);
 			distanceI.setVisibility(View.VISIBLE);
-			distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_distance));
+			distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_distance_16));
 			ImageView pointsI = (ImageView) v.findViewById(R.id.points_icon);
 			pointsI.setVisibility(View.VISIBLE);
-			pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_point));
+			pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_waypoint_16));
 			ImageView timeI = (ImageView) v.findViewById(R.id.time_icon);
 			timeI.setVisibility(View.VISIBLE);
-			timeI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_time));
+			timeI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_time_16));
 			TextView time = (TextView) v.findViewById(R.id.time);
 			TextView distance = (TextView) v.findViewById(R.id.distance);
 			TextView pointsCount = (TextView) v.findViewById(R.id.points_count);
diff --git a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
index 7651f8413a..8ceb40eb42 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
@@ -840,9 +840,22 @@ public class ImportHelper {
 	}
 
 	private void handlePluginImport(final PluginSettingsItem pluginItem, final File file) {
+		final ProgressDialog progress = new ProgressDialog(activity);
+		progress.setTitle(app.getString(R.string.loading_smth, ""));
+		progress.setMessage(app.getString(R.string.importing_from, pluginItem.getPublicName(app)));
+		progress.setIndeterminate(true);
+		progress.setCancelable(false);
+
+		if (AndroidUtils.isActivityNotDestroyed(activity)) {
+			progress.show();
+		}
+
 		final SettingsImportListener importListener = new SettingsImportListener() {
 			@Override
 			public void onSettingsImportFinished(boolean succeed, @NonNull List<SettingsItem> items) {
+				if (AndroidUtils.isActivityNotDestroyed(activity)) {
+					progress.dismiss();
+				}
 				CustomOsmandPlugin plugin = pluginItem.getPlugin();
 				plugin.loadResources();
 
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
index 9946692ae9..167d3558b2 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
@@ -3,6 +3,8 @@ package net.osmand.plus.helpers;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 
+import androidx.appcompat.content.res.AppCompatResources;
+
 import net.osmand.GPXUtilities;
 import net.osmand.Location;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
@@ -383,11 +385,11 @@ public class WaypointHelper {
 									point.getLatitude(), point.getLongitude()) - lwp.getDeviationDistance());
 							Integer state = locationPointsStates.get(point);
 							if (state != null && state == ANNOUNCED_ONCE
-									&& voiceRouter.isDistanceLess(lastKnownLocation.getSpeed(), d1, SHORT_ANNOUNCE_RADIUS, 0f)) {
+									&& voiceRouter.isDistanceLess(lastKnownLocation.getSpeed(), d1, SHORT_ANNOUNCE_RADIUS)) {
 								locationPointsStates.put(point, ANNOUNCED_DONE);
 								announcePoints.add(lwp);
 							} else if (type != ALARMS && (state == null || state == NOT_ANNOUNCED)
-									&& voiceRouter.isDistanceLess(lastKnownLocation.getSpeed(), d1, LONG_ANNOUNCE_RADIUS, 0f)) {
+									&& voiceRouter.isDistanceLess(lastKnownLocation.getSpeed(), d1, LONG_ANNOUNCE_RADIUS)) {
 								locationPointsStates.put(point, ANNOUNCED_ONCE);
 								approachPoints.add(lwp);
 							} else if (type == ALARMS && (state == null || state == NOT_ANNOUNCED)) {
@@ -404,7 +406,7 @@ public class WaypointHelper {
 										announceRadius = ALARMS_ANNOUNCE_RADIUS;
 										break;
 								}
-								boolean proceed = voiceRouter.isDistanceLess(lastKnownLocation.getSpeed(), d1, announceRadius, 0f);
+								boolean proceed = voiceRouter.isDistanceLess(lastKnownLocation.getSpeed(), d1, announceRadius);
 								if (proceed && filter) {
 									AlarmInfo lastAlarm = lastAnnouncedAlarms.get(t);
 									if (lastAlarm != null) {
@@ -749,10 +751,10 @@ public class WaypointHelper {
 				PoiType st = amenity.getType().getPoiTypeByKeyName(amenity.getSubType());
 				if (st != null) {
 					if (RenderingIcons.containsBigIcon(st.getIconKeyName())) {
-						return uiCtx.getResources().getDrawable(
+						return AppCompatResources.getDrawable(uiCtx, 
 								RenderingIcons.getBigIconResourceId(st.getIconKeyName()));
 					} else if (RenderingIcons.containsBigIcon(st.getOsmTag() + "_" + st.getOsmValue())) {
-						return uiCtx.getResources().getDrawable(
+						return AppCompatResources.getDrawable(uiCtx, 
 								RenderingIcons.getBigIconResourceId(st.getOsmTag() + "_" + st.getOsmValue()));
 					}
 				}
@@ -788,36 +790,36 @@ public class WaypointHelper {
 				//assign alarm list icons manually for now
 				String typeString = ((AlarmInfo) point).getType().toString();
 				if (typeString.equals("SPEED_CAMERA")) {
-					return uiCtx.getResources().getDrawable(R.drawable.mx_highway_speed_camera);
+					return AppCompatResources.getDrawable(uiCtx, R.drawable.mx_highway_speed_camera);
 				} else if (typeString.equals("BORDER_CONTROL")) {
-					return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control);
+					return AppCompatResources.getDrawable(uiCtx, R.drawable.mx_barrier_border_control);
 				} else if (typeString.equals("RAILWAY")) {
 					if (app.getSettings().DRIVING_REGION.get().americanSigns) {
-						return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways_us);
+						return AppCompatResources.getDrawable(uiCtx, R.drawable.list_warnings_railways_us);
 					} else {
-						return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways);
+						return AppCompatResources.getDrawable(uiCtx, R.drawable.list_warnings_railways);
 					}
 				} else if (typeString.equals("TRAFFIC_CALMING")) {
 					if (app.getSettings().DRIVING_REGION.get().americanSigns) {
-						return uiCtx.getResources().getDrawable(R.drawable.list_warnings_traffic_calming_us);
+						return AppCompatResources.getDrawable(uiCtx, R.drawable.list_warnings_traffic_calming_us);
 					} else {
-						return uiCtx.getResources().getDrawable(R.drawable.list_warnings_traffic_calming);
+						return AppCompatResources.getDrawable(uiCtx, R.drawable.list_warnings_traffic_calming);
 					}
 				} else if (typeString.equals("TOLL_BOOTH")) {
-					return uiCtx.getResources().getDrawable(R.drawable.mx_toll_booth);
+					return AppCompatResources.getDrawable(uiCtx, R.drawable.mx_toll_booth);
 				} else if (typeString.equals("STOP")) {
-					return uiCtx.getResources().getDrawable(R.drawable.list_stop);
+					return AppCompatResources.getDrawable(uiCtx, R.drawable.list_stop);
 				} else if (typeString.equals("PEDESTRIAN")) {
 					if (app.getSettings().DRIVING_REGION.get().americanSigns) {
-						return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian_us);
+						return AppCompatResources.getDrawable(uiCtx, R.drawable.list_warnings_pedestrian_us);
 					} else {
-						return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian);
+						return AppCompatResources.getDrawable(uiCtx, R.drawable.list_warnings_pedestrian);
 					}
 				} else if (typeString.equals("TUNNEL")) {
 					if (app.getSettings().DRIVING_REGION.get().americanSigns) {
-						return uiCtx.getResources().getDrawable(R.drawable.list_warnings_tunnel_us);
+						return AppCompatResources.getDrawable(uiCtx, R.drawable.list_warnings_tunnel_us);
 					} else {
-						return uiCtx.getResources().getDrawable(R.drawable.list_warnings_tunnel);
+						return AppCompatResources.getDrawable(uiCtx, R.drawable.list_warnings_tunnel);
 					}
 				} else {
 					return null;
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
index 7f8b0e4abc..01509b5609 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
@@ -250,7 +250,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
 			}
 		});
 
-		setThemedDrawable((ImageView) view.findViewById(R.id.userNameIcon), R.drawable.ic_person);
+		setThemedDrawable((ImageView) view.findViewById(R.id.userNameIcon), R.drawable.ic_action_user);
 		setThemedDrawable((ImageView) view.findViewById(R.id.emailIcon), R.drawable.ic_action_message);
 		setThemedDrawable((ImageView) view.findViewById(R.id.countryIcon), R.drawable.ic_world_globe_dark);
 		selectCountryEdit.setCompoundDrawablesWithIntrinsicBounds(
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/UsersReportFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/UsersReportFragment.java
index 2dc66ef10e..fd68aa138f 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/UsersReportFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/UsersReportFragment.java
@@ -87,7 +87,7 @@ public class UsersReportFragment extends BaseOsmAndDialogFragment {
 
 	@DrawableRes
 	protected int getListItemIcon() {
-		return R.drawable.ic_person;
+		return R.drawable.ic_action_user;
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 6a8a4f5d56..0bb79dd8cc 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -39,6 +39,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentActivity;
@@ -869,10 +870,9 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		if (mapActivity != null) {
 			button.setImageDrawable(mapActivity.getMyApplication().getUIUtilities().getIcon(night ? iconDarkId : iconLightId));
 			if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-				button.setBackground(mapActivity.getResources().getDrawable(night ? bgDarkId : bgLightId,
-						mapActivity.getTheme()));
+				button.setBackground(AppCompatResources.getDrawable(mapActivity, night ? bgDarkId : bgLightId));
 			} else {
-				button.setBackgroundDrawable(mapActivity.getResources().getDrawable(night ? bgDarkId : bgLightId));
+				button.setBackgroundDrawable(AppCompatResources.getDrawable(mapActivity, night ? bgDarkId : bgLightId));
 			}
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
index 3e1dbd23bc..29ebf1502c 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
@@ -14,6 +14,7 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.GPXUtilities.WptPt;
@@ -745,7 +746,7 @@ public abstract class MenuController extends BaseMenuController implements Colla
 					return enabled ? getNormalIcon(resId) : getDisabledIcon(resId);
 				}
 				MapActivity mapActivity = getMapActivity();
-				return mapActivity != null ? ContextCompat.getDrawable(mapActivity, resId) : null;
+				return mapActivity != null ? AppCompatResources.getDrawable(mapActivity, resId) : null;
 			}
 			return null;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java
index 24a8e5e9be..823b708e92 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/GpxItemMenuBuilder.java
@@ -54,12 +54,12 @@ public class GpxItemMenuBuilder extends MenuBuilder {
 
 		int textColor = ContextCompat.getColor(ll.getContext(), light ? R.color.text_color_primary_light : R.color.text_color_primary_dark);
 
-		buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_small_point);
+		buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_action_waypoint_16);
 		buildTextView(ll, gpxSmallTextMargin, gpxTextSize, textColor, "" + item.analysis.wptPoints);
-		buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_small_distance);
+		buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_action_distance_16);
 		buildTextView(ll, gpxSmallTextMargin, gpxTextSize, textColor,
 				OsmAndFormatter.getFormattedDistance(item.analysis.totalDistance, app));
-		buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_small_time);
+		buildIcon(ll, gpxSmallIconMargin, R.drawable.ic_action_time_16);
 		buildTextView(ll, gpxSmallTextMargin, gpxTextSize, textColor, Algorithms.formatDuration((int) (item.analysis.timeSpan / 1000), app.accessibilityEnabled()) + "");
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java
index edbb581c0a..020041a10d 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/AMapPointMenuController.java
@@ -218,7 +218,7 @@ public class AMapPointMenuController extends MenuController {
 			}
 		}
 		if (!TextUtils.isEmpty(point.getShortName())) {
-			return R.drawable.ic_small_group;
+			return R.drawable.ic_action_group_name_16;
 		}
 		return NO_ICON;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/HistoryMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/HistoryMenuController.java
index 446557af96..246dfe5b0a 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/HistoryMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/HistoryMenuController.java
@@ -60,7 +60,7 @@ public class HistoryMenuController extends MenuController {
 	@Override
 	public Drawable getSecondLineTypeIcon() {
 		if (hasTypeInDescription) {
-			return getIcon(R.drawable.ic_small_group);
+			return getIcon(R.drawable.ic_action_group_name_16);
 		} else {
 			return null;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java
index 188ae5c013..9bad770437 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/ImpassibleRoadsMenuController.java
@@ -3,6 +3,7 @@ package net.osmand.plus.mapcontextmenu.controllers;
 import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.data.PointDescription;
@@ -68,7 +69,7 @@ public class ImpassibleRoadsMenuController extends MenuController {
 	public Drawable getRightIcon() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
-			return ContextCompat.getDrawable(mapActivity, R.drawable.map_pin_avoid_road);
+			return AppCompatResources.getDrawable(mapActivity, R.drawable.map_pin_avoid_road);
 		} else {
 			return null;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MyLocationMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MyLocationMenuController.java
index 71b55e9d71..f5cf6e81d8 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MyLocationMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MyLocationMenuController.java
@@ -3,6 +3,7 @@ package net.osmand.plus.mapcontextmenu.controllers;
 import android.graphics.drawable.Drawable;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
 
 import net.osmand.data.PointDescription;
 import net.osmand.plus.R;
@@ -52,7 +53,7 @@ public class MyLocationMenuController  extends MenuController {
 	public Drawable getRightIcon() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
-			return mapActivity.getResources().getDrawable(R.drawable.ic_action_location_color);
+			return AppCompatResources.getDrawable(mapActivity, R.drawable.ic_action_location_color);
 		} else {
 			return null;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/PointDescriptionMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/PointDescriptionMenuController.java
index 7362e6ab66..114a6fb6f1 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/PointDescriptionMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/PointDescriptionMenuController.java
@@ -75,7 +75,7 @@ public class PointDescriptionMenuController extends MenuController {
 	@Override
 	public Drawable getSecondLineTypeIcon() {
 		if (hasTypeInDescription) {
-			return getIcon(R.drawable.ic_small_group);
+			return getIcon(R.drawable.ic_action_group_name_16);
 		} else {
 			return null;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java
index a8654f9ff6..c6a5e13e64 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/RenderedObjectMenuController.java
@@ -58,7 +58,7 @@ public class RenderedObjectMenuController extends MenuController {
 		if (renderedObject.getIconRes() != null && RenderingIcons.containsBigIcon(renderedObject.getIconRes())) {
 			return RenderingIcons.getBigIconResourceId(renderedObject.getIconRes());
 		} else {
-			return R.drawable.ic_type_address;
+			return R.drawable.ic_action_street_name;
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
index 8364f64ddb..59de7e4f9b 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
@@ -26,6 +26,7 @@ import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
 
 import androidx.annotation.NonNull;
@@ -322,12 +323,12 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 				.inflate(R.layout.point_editor_button, rootView, false);
 		ImageView outline = colorItemView.findViewById(R.id.outline);
 		outline.setImageDrawable(
-				UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle_contour),
+				UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.bg_point_circle_contour),
 						ContextCompat.getColor(app,
 								nightMode ? R.color.stroked_buttons_and_links_outline_dark
 										: R.color.stroked_buttons_and_links_outline_light)));
 		ImageView backgroundCircle = colorItemView.findViewById(R.id.background);
-		backgroundCircle.setImageDrawable(UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle), color));
+		backgroundCircle.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.bg_point_circle), color));
 		backgroundCircle.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -399,7 +400,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 		newShape.findViewById(R.id.outline).setVisibility(View.VISIBLE);
 		((TextView) rootView.findViewById(R.id.shape_name)).setText(backgroundType.getNameId());
 		ImageView background = newShape.findViewById(R.id.background);
-		background.setImageDrawable(UiUtilities.tintDrawable(ContextCompat.getDrawable(app, backgroundType.getIconId()),
+		background.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, backgroundType.getIconId()),
 						selectedColor));
 		selectedShape = backgroundType;
 		setBackgroundType(backgroundType);
@@ -407,7 +408,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 	}
 
 	private void setShapeSelectorBackground(BackgroundType backgroundType, ImageView background) {
-		background.setImageDrawable(UiUtilities.tintDrawable(ContextCompat.getDrawable(app, backgroundType.getIconId()),
+		background.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, backgroundType.getIconId()),
 						ContextCompat.getColor(app,
 								nightMode ? R.color.inactive_buttons_and_links_bg_dark
 										: R.color.inactive_buttons_and_links_bg_light)));
@@ -481,7 +482,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 				.inflate(R.layout.point_editor_button, rootView, false);
 		ImageView outline = iconItemView.findViewById(R.id.outline);
 		outline.setImageDrawable(
-				UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle_contour),
+				UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.bg_point_circle_contour),
 						ContextCompat.getColor(app,
 								nightMode ? R.color.stroked_buttons_and_links_outline_dark
 										: R.color.stroked_buttons_and_links_outline_light)));
@@ -508,18 +509,18 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 			ImageView background = oldIcon.findViewById(R.id.background);
 			setIconSelectorBackground(background);
 			ImageView iconView = oldIcon.findViewById(R.id.icon);
-			iconView.setImageDrawable(UiUtilities.tintDrawable(ContextCompat.getDrawable(app, selectedIcon),
+			iconView.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, selectedIcon),
 					ContextCompat.getColor(app, R.color.icon_color_default_light)));
 		}
 		View icon = rootView.findViewWithTag(iconRes);
 		if (icon != null) {
 			ImageView iconView = icon.findViewById(R.id.icon);
-			iconView.setImageDrawable(UiUtilities.tintDrawable(ContextCompat.getDrawable(app, iconRes),
+			iconView.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, iconRes),
 					ContextCompat.getColor(app, R.color.color_white)));
 			icon.findViewById(R.id.outline).setVisibility(View.VISIBLE);
 			ImageView backgroundCircle = icon.findViewById(R.id.background);
 			backgroundCircle.setImageDrawable(
-					UiUtilities.tintDrawable(ContextCompat.getDrawable(view.getContext(), R.drawable.bg_point_circle), selectedColor));
+					UiUtilities.tintDrawable(AppCompatResources.getDrawable(view.getContext(), R.drawable.bg_point_circle), selectedColor));
 		}
 		selectedIcon = iconRes;
 		setIcon(iconRes);
@@ -527,7 +528,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 	}
 
 	private void setIconSelectorBackground(ImageView backgroundCircle) {
-		backgroundCircle.setImageDrawable(UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_point_circle),
+		backgroundCircle.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.bg_point_circle),
 						ContextCompat.getColor(app, nightMode
 								? R.color.inactive_buttons_and_links_bg_dark
 								: R.color.inactive_buttons_and_links_bg_light)));
@@ -790,7 +791,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 				Drawable iconAdd = app.getUIUtilities().getIcon(R.drawable.ic_action_add, activeColorResId);
 				((ImageView) view.findViewById(R.id.groupIcon)).setImageDrawable(iconAdd);
 				((TextView) view.findViewById(R.id.groupName)).setText(requireMyApplication().getString(R.string.add_group));
-				GradientDrawable rectContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app,
+				GradientDrawable rectContourDrawable = (GradientDrawable) AppCompatResources.getDrawable(app,
 						R.drawable.bg_select_group_button_outline);
 				if (rectContourDrawable != null) {
 					int strokeColor = ContextCompat.getColor(app, nightMode ? R.color.stroked_buttons_and_links_outline_dark
@@ -833,7 +834,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 				int categoryColor = getCategoryColor(group);
 				int color = categoryColor == 0 ? getDefaultColor() : categoryColor;
 				holder.groupIcon.setImageDrawable(UiUtilities.tintDrawable(
-						ContextCompat.getDrawable(app, R.drawable.ic_action_folder), color));
+						AppCompatResources.getDrawable(app, R.drawable.ic_action_folder), color));
 				holder.pointsCounter.setText(String.valueOf(getCategoryPointsCount(group)));
 				int strokeColor;
 				int strokeWidth;
@@ -846,7 +847,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 							: R.color.stroked_buttons_and_links_outline_light);
 					strokeWidth = 1;
 				}
-				GradientDrawable rectContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app,
+				GradientDrawable rectContourDrawable = (GradientDrawable) AppCompatResources.getDrawable(app,
 						R.drawable.bg_select_group_button_outline);
 				if (rectContourDrawable != null) {
 					rectContourDrawable.setStroke(AndroidUtils.dpToPx(app, strokeWidth), strokeColor);
@@ -921,7 +922,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 				textView.setTextColor(ContextCompat.getColor(app, R.color.color_white));
 			} else {
 				textView.setTextColor(ContextCompat.getColor(app, R.color.preference_category_title));
-				GradientDrawable buttonBackground = (GradientDrawable) ContextCompat.getDrawable(app,
+				GradientDrawable buttonBackground = (GradientDrawable) AppCompatResources.getDrawable(app,
 						R.drawable.bg_select_icon_group_button).mutate();
 				buttonBackground.setStroke(AndroidUtils.dpToPx(app, 1), ContextCompat.getColor(app,
 						nightMode ? R.color.stroked_buttons_and_links_outline_dark
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java
index be307b8aea..4158b39fdb 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/SelectCategoryDialogFragment.java
@@ -12,7 +12,9 @@ import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 
@@ -182,9 +184,12 @@ public class SelectCategoryDialogFragment extends DialogFragment {
 
 	private static Drawable getIcon(final Activity activity, int resId, int color) {
 		OsmandApplication app = (OsmandApplication)activity.getApplication();
-		Drawable d = app.getResources().getDrawable(resId).mutate();
-		d.clearColorFilter();
-		d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+		Drawable d = AppCompatResources.getDrawable(activity, resId);
+		if (d != null) {
+			d = DrawableCompat.wrap(d).mutate();
+			d.clearColorFilter();
+			d.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+		}
 		return d;
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
index edcb722eea..35fa25d2d5 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
@@ -16,6 +16,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -85,7 +86,7 @@ public class MapMultiSelectionMenuFragment extends Fragment implements MultiSele
 			));
 
 			ImageView shadow = new ImageView(context);
-			shadow.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.bg_shadow_onmap));
+			shadow.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.bg_shadow_onmap));
 			shadow.setLayoutParams(new FrameLayout.LayoutParams(
 					FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM
 			));
diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java
index 5aeac322a5..111db7c38a 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryAutoCompleteAdapter.java
@@ -137,7 +137,7 @@ public class MapillaryAutoCompleteAdapter extends ArrayAdapter<String> implement
 
         nameTv.setText(names.get(position));
         if (wrong) {
-            Drawable icon = app.getUIUtilities().getPaintedIcon(R.drawable.ic_warning, app.getResources().getColor(R.color.color_warning));
+            Drawable icon = app.getUIUtilities().getPaintedIcon(R.drawable.ic_action_alert, app.getResources().getColor(R.color.color_warning));
             iconIv.setImageDrawable(icon);
             iconIv.setVisibility(View.VISIBLE);
         }
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index 232b73084c..319eef1ae5 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -43,6 +43,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
@@ -600,9 +601,10 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 		@DrawableRes int itemBg = lightTheme ? R.drawable.keyboard_item_light_bg : R.drawable.keyboard_item_dark_bg;
 		@DrawableRes int controlItemBg = lightTheme ? R.drawable.keyboard_item_control_light_bg : R.drawable.keyboard_item_control_dark_bg;
 
-		ColorStateList clearItemTextColorStateList = AndroidUtils.createPressedColorStateList(getContext(),
+		Context ctx = requireContext();
+		ColorStateList clearItemTextColorStateList = AndroidUtils.createPressedColorStateList(ctx,
 				R.color.keyboard_item_divider_control_color_light, R.color.keyboard_item_divider_control_color_light_pressed);
-		ColorStateList numberColorStateList = AndroidUtils.createPressedColorStateList(getContext(),
+		ColorStateList numberColorStateList = AndroidUtils.createPressedColorStateList(ctx,
 				R.color.keyboard_item_text_color_light, R.color.keyboard_item_text_color_light_pressed);
 
 		@ColorInt int textColorDark = getResolvedColor(R.color.keyboard_item_text_color_dark);
@@ -645,10 +647,13 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 				itemTv.setVisibility(View.GONE);
 				itemIv.setVisibility(View.VISIBLE);
 				itemBottomSpace.setVisibility(View.GONE);
-				Drawable icon;
+				Drawable icon = null;
 				if (lightTheme) {
-					icon = DrawableCompat.wrap(getResources().getDrawable((Integer) item));
-					DrawableCompat.setTintList(icon, numberColorStateList);
+					Drawable drawable = AppCompatResources.getDrawable(ctx, (Integer) item);
+					if (drawable != null) {
+						icon = DrawableCompat.wrap(drawable);
+						DrawableCompat.setTintList(icon, numberColorStateList);
+					}
 				} else {
 					icon = getColoredIcon((Integer) item, R.color.keyboard_item_divider_control_color_dark);
 				}
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
index fb99d047f1..fdeb36c789 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.MotionEventCompat;
 import androidx.recyclerview.widget.RecyclerView;
@@ -86,9 +87,9 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter<MapMarkerItemV
 			holder.mainLayout.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.list_divider_dark : R.color.markers_top_bar_background));
 			holder.title.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.text_color_primary_dark : R.color.color_white));
 			holder.divider.setBackgroundColor(ContextCompat.getColor(mapActivity, R.color.map_markers_on_map_divider_color));
-			holder.optionsBtn.setBackgroundDrawable(mapActivity.getResources().getDrawable(R.drawable.marker_circle_background_on_map_with_inset));
+			holder.optionsBtn.setBackgroundDrawable(AppCompatResources.getDrawable(mapActivity, R.drawable.marker_circle_background_on_map_with_inset));
 			holder.optionsBtn.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_marker_passed, R.color.color_white));
-			holder.iconReorder.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_reorder, R.color.icon_color_default_light));
+			holder.iconReorder.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_item_move, R.color.icon_color_default_light));
 			holder.description.setTextColor(ContextCompat.getColor(mapActivity, R.color.map_markers_on_map_color));
 
 			drawableResToUpdate = R.drawable.ic_arrow_marker_diretion;
@@ -100,9 +101,9 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter<MapMarkerItemV
 			holder.mainLayout.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.list_background_color_dark : R.color.list_background_color_light));
 			holder.title.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.text_color_primary_dark : R.color.text_color_primary_light));
 			holder.divider.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.app_bar_color_dark : R.color.divider_color_light));
-			holder.optionsBtn.setBackgroundDrawable(mapActivity.getResources().getDrawable(night ? R.drawable.marker_circle_background_dark_with_inset : R.drawable.marker_circle_background_light_with_inset));
+			holder.optionsBtn.setBackgroundDrawable(AppCompatResources.getDrawable(mapActivity, night ? R.drawable.marker_circle_background_dark_with_inset : R.drawable.marker_circle_background_light_with_inset));
 			holder.optionsBtn.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_marker_passed, actionIconColor));
-			holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_reorder));
+			holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_item_move));
 			holder.description.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.icon_color_default_dark : R.color.icon_color_default_light));
 
 			drawableResToUpdate = R.drawable.ic_direction_arrow;
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
index 0cd5421c3d..4af88fed0c 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java
@@ -9,6 +9,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -282,7 +283,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 				itemViewHolder.mainLayout.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.list_divider_dark : R.color.markers_top_bar_background));
 				itemViewHolder.title.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.text_color_primary_dark : R.color.color_white));
 				itemViewHolder.divider.setBackgroundColor(ContextCompat.getColor(mapActivity, R.color.map_markers_on_map_divider_color));
-				itemViewHolder.optionsBtn.setBackgroundDrawable(mapActivity.getResources().getDrawable(R.drawable.marker_circle_background_on_map_with_inset));
+				itemViewHolder.optionsBtn.setBackgroundDrawable(AppCompatResources.getDrawable(mapActivity, R.drawable.marker_circle_background_on_map_with_inset));
 				itemViewHolder.optionsBtn.setImageDrawable(iconsCache.getIcon(markerInHistory ? R.drawable.ic_action_reset_to_default_dark : R.drawable.ic_action_marker_passed, R.color.color_white));
 				itemViewHolder.description.setTextColor(ContextCompat.getColor(mapActivity, R.color.map_markers_on_map_color));
 
@@ -295,7 +296,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 				itemViewHolder.mainLayout.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.list_background_color_dark : R.color.list_background_color_light));
 				itemViewHolder.title.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.text_color_primary_dark : R.color.text_color_primary_light));
 				itemViewHolder.divider.setBackgroundColor(ContextCompat.getColor(mapActivity, night ? R.color.app_bar_color_dark : R.color.divider_color_light));
-				itemViewHolder.optionsBtn.setBackgroundDrawable(mapActivity.getResources().getDrawable(night ? R.drawable.marker_circle_background_dark_with_inset : R.drawable.marker_circle_background_light_with_inset));
+				itemViewHolder.optionsBtn.setBackgroundDrawable(AppCompatResources.getDrawable(mapActivity, night ? R.drawable.marker_circle_background_dark_with_inset : R.drawable.marker_circle_background_light_with_inset));
 				itemViewHolder.optionsBtn.setImageDrawable(iconsCache.getIcon(markerInHistory ? R.drawable.ic_action_reset_to_default_dark : R.drawable.ic_action_marker_passed, actionIconColor));
 				itemViewHolder.description.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.icon_color_default_dark : R.color.icon_color_default_light));
 
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java
index 1bd43aa669..69ecd78f3e 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java
@@ -4,6 +4,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -135,7 +136,7 @@ public class MapMarkersHistoryAdapter extends RecyclerView.Adapter<RecyclerView.
 			}
 			itemViewHolder.description.setText(desc);
 
-			itemViewHolder.optionsBtn.setBackgroundDrawable(app.getResources().getDrawable(night ? R.drawable.marker_circle_background_dark_with_inset : R.drawable.marker_circle_background_light_with_inset));
+			itemViewHolder.optionsBtn.setBackgroundDrawable(AppCompatResources.getDrawable(app, night ? R.drawable.marker_circle_background_dark_with_inset : R.drawable.marker_circle_background_light_with_inset));
 			itemViewHolder.optionsBtn.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_reset_to_default_dark, actionIconColor));
 			itemViewHolder.optionsBtn.setOnClickListener(new View.OnClickListener() {
 				@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
index 88b43b34df..6560f40a5b 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
@@ -7,6 +7,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.MotionEventCompat;
 import androidx.recyclerview.widget.RecyclerView;
@@ -144,7 +145,7 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
 		}
 		holder.bottomShadow.setVisibility(lastMarkerItem ? View.VISIBLE : View.GONE);
 		holder.iconReorder.setVisibility(View.VISIBLE);
-		holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_reorder));
+		holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_item_move));
 		holder.description.setTextColor(ContextCompat.getColor(mapActivity, night ? R.color.icon_color_default_dark : R.color.icon_color_default_light));
 
 		holder.firstDescription.setVisibility((start || finish) ? View.VISIBLE : View.GONE);
@@ -155,7 +156,7 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
 		}
 
 		if (location != null) {
-			holder.icon.setImageDrawable(ContextCompat.getDrawable(mapActivity, R.drawable.ic_action_location_color));
+			holder.icon.setImageDrawable(AppCompatResources.getDrawable(mapActivity, R.drawable.ic_action_location_color));
 		} else {
 			int res = start ? R.drawable.ic_action_point_start : (finish ? R.drawable.ic_action_point_destination : R.drawable.ic_action_flag_dark);
 			holder.icon.setImageDrawable(iconsCache.getIcon(res, MapMarker.getColorId(marker.colorIndex)));
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index ff034478d8..dbf5197f92 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -63,7 +63,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 	@Override
 	public void onBindViewHolder(@NonNull final MeasureToolItemVH holder, int pos) {
 		UiUtilities iconsCache = mapActivity.getMyApplication().getUIUtilities();
-		holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_reorder));
+		holder.iconReorder.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_item_move));
 		holder.iconReorder.setOnTouchListener(new View.OnTouchListener() {
 			@Override
 			public boolean onTouch(View view, MotionEvent event) {
diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
index dd9b630132..34260adb63 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java
@@ -241,10 +241,10 @@ public class DashTrackFragment extends DashBaseFragment {
 		v.findViewById(R.id.points_icon).setVisibility(View.VISIBLE);
 		ImageView distance = (ImageView) v.findViewById(R.id.distance_icon);
 		distance.setVisibility(View.VISIBLE);
-		distance.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_distance));
+		distance.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_distance_16));
 		ImageView pointsCount = (ImageView) v.findViewById(R.id.points_icon);
 		pointsCount.setVisibility(View.VISIBLE);
-		pointsCount.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_point));
+		pointsCount.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_waypoint_16));
 	}
 
 	private void updateShowOnMap(final OsmandApplication app, final File f, final View pView, final ImageButton showOnMap) {
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index f6ca2092ea..61e1284f59 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -404,9 +404,9 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 
 	public void createCurrentTrackView() {
 		ImageView distanceI = (ImageView) currentGpxView.findViewById(R.id.distance_icon);
-		distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_distance));
+		distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_distance_16));
 		ImageView pointsI = (ImageView) currentGpxView.findViewById(R.id.points_icon);
-		pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_point));
+		pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_waypoint_16));
 		updateCurrentTrack();
 	}
 
@@ -1793,13 +1793,13 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 			v.findViewById(R.id.unknown_section).setVisibility(View.GONE);
 			ImageView distanceI = (ImageView) v.findViewById(R.id.distance_icon);
 			distanceI.setVisibility(View.VISIBLE);
-			distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_distance));
+			distanceI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_distance_16));
 			ImageView pointsI = (ImageView) v.findViewById(R.id.points_icon);
 			pointsI.setVisibility(View.VISIBLE);
-			pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_point));
+			pointsI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_waypoint_16));
 			ImageView timeI = (ImageView) v.findViewById(R.id.time_icon);
 			timeI.setVisibility(View.VISIBLE);
-			timeI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_small_time));
+			timeI.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_time_16));
 			TextView time = (TextView) v.findViewById(R.id.time);
 			TextView distance = (TextView) v.findViewById(R.id.distance);
 			TextView pointsCount = (TextView) v.findViewById(R.id.points_count);
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
index cfef97d52d..2988ce6a44 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
@@ -16,6 +16,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
@@ -245,14 +246,16 @@ public class FavoritesActivity extends TabActivity {
 			SearchView.SearchAutoComplete searchEdit = (SearchView.SearchAutoComplete) searchView.findViewById(R.id.search_src_text);
 			searchEdit.setTextColor(activity.getResources().getColor(R.color.color_white));
 			SpannableStringBuilder stopHint = new SpannableStringBuilder("   ");
-			Float rawTextSize = searchEdit.getTextSize();
+			float rawTextSize = searchEdit.getTextSize();
 			int textSize = (int) (rawTextSize * 1.25);
 
 			//setting icon as spannable
-			Drawable searchIcon = activity.getResources().getDrawable(R.drawable.ic_action_search_dark);
-			searchIcon.setBounds(0,0, textSize, textSize);
-			stopHint.setSpan(new ImageSpan(searchIcon), 1, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-			searchEdit.setHint(stopHint);
+			Drawable searchIcon = AppCompatResources.getDrawable(activity, R.drawable.ic_action_search_dark);
+			if (searchIcon != null) {
+				searchIcon.setBounds(0, 0, textSize, textSize);
+				stopHint.setSpan(new ImageSpan(searchIcon), 1, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+				searchEdit.setHint(stopHint);
+			}
 		} catch (Exception e) {
 			// ignore
 		}
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
index 5aa5390dea..ec49b0998b 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackActivityFragmentAdapter.java
@@ -22,6 +22,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.ListPopupWindow;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
@@ -894,7 +895,7 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
 	}
 
 	public void openFabMenu(@NonNull Context context) {
-		menuFab.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_action_remove_dark));
+		menuFab.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_action_remove_dark));
 		waypointFab.setVisibility(View.VISIBLE);
 		waypointTextLayout.setVisibility(View.VISIBLE);
 		routePointFab.setVisibility(View.VISIBLE);
@@ -905,7 +906,7 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
 	}
 
 	public void closeFabMenu(@NonNull Context context) {
-		menuFab.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_action_plus));
+		menuFab.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.ic_action_plus));
 		waypointFab.setVisibility(View.GONE);
 		waypointTextLayout.setVisibility(View.GONE);
 		routePointFab.setVisibility(View.GONE);
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackBitmapDrawer.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackBitmapDrawer.java
index 1cc0ce8055..e3f2195d88 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackBitmapDrawer.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackBitmapDrawer.java
@@ -11,6 +11,7 @@ import android.graphics.drawable.LayerDrawable;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.AndroidUtils;
@@ -87,7 +88,7 @@ public class TrackBitmapDrawer {
 		defPointColor = ContextCompat.getColor(app, R.color.gpx_color_point);
 		paintIcon = new Paint();
 		pointSmall = BitmapFactory.decodeResource(app.getResources(), R.drawable.map_white_shield_small);
-		selectedPoint = (LayerDrawable) app.getResources().getDrawable(R.drawable.map_location_default);
+		selectedPoint = (LayerDrawable) AppCompatResources.getDrawable(app, R.drawable.map_location_default);
 	}
 
 	public void addListener(TrackBitmapDrawerListener l) {
diff --git a/OsmAnd/src/net/osmand/plus/notifications/ErrorNotification.java b/OsmAnd/src/net/osmand/plus/notifications/ErrorNotification.java
index e0cd7f813d..15b0926421 100644
--- a/OsmAnd/src/net/osmand/plus/notifications/ErrorNotification.java
+++ b/OsmAnd/src/net/osmand/plus/notifications/ErrorNotification.java
@@ -53,7 +53,7 @@ public class ErrorNotification extends OsmandNotification {
 	public NotificationCompat.Builder buildNotification(boolean wearable) {
 		String notificationTitle;
 		String notificationText;
-		icon = R.drawable.ic_action_bug_dark;
+		icon = R.drawable.ic_notification_bug;
 		notificationTitle = app.getString(R.string.shared_string_unexpected_error);
 
 		NavigationService service = app.getNavigationService();
diff --git a/OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java b/OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java
index daef81c368..ed39dff767 100644
--- a/OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java
+++ b/OsmAnd/src/net/osmand/plus/notifications/GpxNotification.java
@@ -119,7 +119,7 @@ public class GpxNotification extends OsmandNotification {
 		String notificationTitle;
 		String notificationText;
 		color = 0;
-		icon = R.drawable.ic_action_polygom_dark;
+		icon = R.drawable.ic_notification_track;
 		boolean isGpxRecording = app.getSavingTrackHelper().getIsRecording();
 		float recordedDistance = app.getSavingTrackHelper().getDistance();
 		ongoing = true;
@@ -161,12 +161,12 @@ public class GpxNotification extends OsmandNotification {
 			PendingIntent stopPendingIntent = PendingIntent.getBroadcast(app, 0, stopIntent,
 					PendingIntent.FLAG_UPDATE_CURRENT);
 			if (app.getSavingTrackHelper().getDistance() > 0) {
-				notificationBuilder.addAction(R.drawable.ic_pause,
+				notificationBuilder.addAction(R.drawable.ic_notification_pause,
 						app.getString(R.string.shared_string_pause), stopPendingIntent);
-				notificationBuilder.addAction(R.drawable.ic_action_save,
+				notificationBuilder.addAction(R.drawable.ic_notification_save,
 						app.getString(R.string.shared_string_save), savePendingIntent);
 			} else {
-				notificationBuilder.addAction(R.drawable.ic_action_rec_stop,
+				notificationBuilder.addAction(R.drawable.ic_notification_rec_stop,
 						app.getString(R.string.shared_string_control_stop), stopPendingIntent);
 			}
 		} else {
@@ -174,12 +174,12 @@ public class GpxNotification extends OsmandNotification {
 			PendingIntent startPendingIntent = PendingIntent.getBroadcast(app, 0, startIntent,
 					PendingIntent.FLAG_UPDATE_CURRENT);
 			if (recordedDistance > 0) {
-				notificationBuilder.addAction(R.drawable.ic_action_rec_start,
-						app.getString(R.string.shared_string_continue), startPendingIntent);
-				notificationBuilder.addAction(R.drawable.ic_action_save,
+				notificationBuilder.addAction(R.drawable.ic_notification_rec_start,
+						app.getString(R.string.shared_string_resume), startPendingIntent);
+				notificationBuilder.addAction(R.drawable.ic_notification_save,
 						app.getString(R.string.shared_string_save), savePendingIntent);
 			} else {
-				notificationBuilder.addAction(R.drawable.ic_action_rec_start,
+				notificationBuilder.addAction(R.drawable.ic_notification_rec_start,
 						app.getString(R.string.shared_string_record), startPendingIntent);
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/notifications/NavigationNotification.java b/OsmAnd/src/net/osmand/plus/notifications/NavigationNotification.java
index 562f9d9191..76d7c7cc9d 100644
--- a/OsmAnd/src/net/osmand/plus/notifications/NavigationNotification.java
+++ b/OsmAnd/src/net/osmand/plus/notifications/NavigationNotification.java
@@ -129,7 +129,7 @@ public class NavigationNotification extends OsmandNotification {
 		String notificationTitle;
 		StringBuilder notificationText = new StringBuilder();
 		color = 0;
-		icon = R.drawable.ic_action_start_navigation;
+		icon = R.drawable.ic_notification_start_navigation;
 		turnBitmap = null;
 		ongoing = true;
 		RoutingHelper routingHelper = app.getRoutingHelper();
@@ -228,20 +228,20 @@ public class NavigationNotification extends OsmandNotification {
 		Intent stopIntent = new Intent(OSMAND_STOP_NAVIGATION_SERVICE_ACTION);
 		PendingIntent stopPendingIntent = PendingIntent.getBroadcast(app, 0, stopIntent,
 				PendingIntent.FLAG_UPDATE_CURRENT);
-		notificationBuilder.addAction(R.drawable.ic_action_remove_dark,
+		notificationBuilder.addAction(R.drawable.ic_notification_remove,
 				app.getString(R.string.shared_string_control_stop), stopPendingIntent);
 
 		if (routingHelper.isRouteCalculated() && routingHelper.isFollowingMode()) {
 			Intent pauseIntent = new Intent(OSMAND_PAUSE_NAVIGATION_SERVICE_ACTION);
 			PendingIntent pausePendingIntent = PendingIntent.getBroadcast(app, 0, pauseIntent,
 					PendingIntent.FLAG_UPDATE_CURRENT);
-			notificationBuilder.addAction(R.drawable.ic_pause,
+			notificationBuilder.addAction(R.drawable.ic_notification_pause,
 					app.getString(R.string.shared_string_pause), pausePendingIntent);
 		} else if (routingHelper.isRouteCalculated() && routingHelper.isPauseNavigation()) {
 			Intent resumeIntent = new Intent(OSMAND_RESUME_NAVIGATION_SERVICE_ACTION);
 			PendingIntent resumePendingIntent = PendingIntent.getBroadcast(app, 0, resumeIntent,
 					PendingIntent.FLAG_UPDATE_CURRENT);
-			notificationBuilder.addAction(R.drawable.ic_play_dark,
+			notificationBuilder.addAction(R.drawable.ic_notification_play,
 					app.getString(R.string.shared_string_continue), resumePendingIntent);
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AddPOIAction.java b/OsmAnd/src/net/osmand/plus/osmedit/AddPOIAction.java
index 8b29e720d9..186a81abfd 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AddPOIAction.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AddPOIAction.java
@@ -28,6 +28,7 @@ import com.google.android.material.textfield.TextInputLayout;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
+import net.osmand.AndroidUtils;
 import net.osmand.CallbackWithObject;
 import net.osmand.data.LatLon;
 import net.osmand.osm.AbstractPoiType;
@@ -62,7 +63,7 @@ import static net.osmand.plus.osmedit.EditPoiData.POI_TYPE_TAG;
 public class AddPOIAction extends QuickAction {
 	public static final QuickActionType TYPE = new QuickActionType(13,
 			"osmpoi.add", AddPOIAction.class).
-			nameRes(R.string.quick_action_add_poi).iconRes(R.drawable.ic_action_gabout_dark).
+			nameRes(R.string.quick_action_add_poi).iconRes(R.drawable.ic_action_info_dark).
 			category(QuickActionType.CREATE_CATEGORY);
 	public static final String KEY_TAG = "key_tag";
 	public static final String KEY_DIALOG = "dialog";
@@ -206,6 +207,7 @@ public class AddPOIAction extends QuickAction {
 
 		final OsmandApplication application = activity.getMyApplication();
 		boolean isLightTheme = application.getSettings().isLightContent();
+		final boolean isLayoutRtl = AndroidUtils.isLayoutRtl(activity);
 		Drawable deleteDrawable = application.getUIUtilities().getIcon(R.drawable.ic_action_remove_dark, isLightTheme);
 
 		final LinearLayout editTagsLineaLayout =
@@ -291,11 +293,20 @@ public class AddPOIAction extends QuickAction {
 			@Override
 			public boolean onTouch(final View v, MotionEvent event) {
 				final EditText editText = (EditText) v;
-				final int DRAWABLE_RIGHT = 2;
 				if (event.getAction() == MotionEvent.ACTION_UP) {
-					if (event.getX() >= (editText.getRight()
-							- editText.getCompoundDrawables()[DRAWABLE_RIGHT].getBounds().width()
-							- editText.getPaddingRight())) {
+					final int DRAWABLE_END = 2;
+					int expandBtnWidth = AndroidUtils.getCompoundDrawables(editText)[DRAWABLE_END].getBounds().width();
+
+					boolean expandButtonPressed;
+					if (isLayoutRtl) {
+						expandButtonPressed = event.getX() <= (editText.getLeft() + expandBtnWidth
+								+ editText.getPaddingLeft());
+					} else {
+						expandButtonPressed = event.getX() >= (editText.getRight() - expandBtnWidth
+								- editText.getPaddingRight());
+					}
+
+					if (expandButtonPressed) {
 						PoiCategory category = getCategory(getAllTranslatedNames(activity));
 						PoiCategory tempPoiCategory = (category != null) ? category : getPoiTypes(activity).getOtherPoiCategory();
 						PoiSubTypeDialogFragment f =
@@ -309,7 +320,6 @@ public class AddPOIAction extends QuickAction {
 
 						CreateEditActionDialog parentFragment = (CreateEditActionDialog) activity.getSupportFragmentManager().findFragmentByTag(CreateEditActionDialog.TAG);
 						f.show(activity.getSupportFragmentManager(), "PoiSubTypeDialogFragment");
-
 						return true;
 					}
 				}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java
index 479a69e26b..b8146e5b7f 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPOIMenuController.java
@@ -178,11 +178,11 @@ public class EditPOIMenuController extends MenuController {
 				}
 			}
 			if (iconResId == 0) {
-				iconResId = R.drawable.ic_type_info;
+				iconResId = R.drawable.ic_action_info_dark;
 			}
 			return iconResId;
 		} else if (osmPoint.getGroup() == OsmPoint.Group.BUG) {
-			return R.drawable.ic_type_bug;
+			return R.drawable.ic_action_bug_dark;
 		} else {
 			return 0;
 		}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java
index 2a62f86ef4..3692da70f8 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugMenuController.java
@@ -79,9 +79,9 @@ public class OsmBugMenuController extends MenuController {
 	@Override
 	public Drawable getRightIcon() {
 		if (bug.isOpened()) {
-			return getIcon(R.drawable.ic_action_gabout_dark, R.color.osm_bug_unresolved_icon_color);
+			return getIcon(R.drawable.ic_action_info_dark, R.color.osm_bug_unresolved_icon_color);
 		} else {
-			return getIcon(R.drawable.ic_action_gabout_dark, R.color.osm_bug_resolved_icon_color);
+			return getIcon(R.drawable.ic_action_info_dark, R.color.osm_bug_resolved_icon_color);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java
index 9668654adc..e13629eb52 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java
@@ -1,5 +1,6 @@
 package net.osmand.plus.osmedit;
 
+import android.content.Context;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.text.SpannableString;
@@ -22,6 +23,7 @@ import androidx.core.content.ContextCompat;
 import net.osmand.osm.PoiType;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.render.RenderingIcons;
 
 import java.util.List;
@@ -71,14 +73,16 @@ public class OsmEditsAdapter extends ArrayAdapter<Object> {
 	@NonNull
 	@Override
 	public View getView(int position, View convertView, @NonNull ViewGroup parent) {
+		boolean nightMode = !app.getSettings().isLightContent();
+		Context themedCtx = UiUtilities.getThemedContext(getContext(), nightMode);
 		if (portrait) {
 			if (convertView == null) {
 				if (position == 0) {
-					convertView = LayoutInflater.from(getContext()).inflate(R.layout.list_item_header, parent, false);
+					convertView = LayoutInflater.from(themedCtx).inflate(R.layout.list_item_header, parent, false);
 					HeaderViewHolder holder = new HeaderViewHolder(convertView);
 					convertView.setTag(holder);
 				} else {
-					convertView = LayoutInflater.from(getContext()).inflate(R.layout.note_list_item, parent, false);
+					convertView = LayoutInflater.from(themedCtx).inflate(R.layout.note_list_item, parent, false);
 					OsmEditViewHolder holder = new OsmEditViewHolder(convertView);
 					convertView.setTag(holder);
 				}
@@ -98,21 +102,21 @@ public class OsmEditsAdapter extends ArrayAdapter<Object> {
 			int margin = app.getResources().getDimensionPixelSize(R.dimen.content_padding);
 			int sideMargin = app.getResources().getDisplayMetrics().widthPixels / 10;
 
-			FrameLayout fl = new FrameLayout(getContext());
-			LinearLayout ll = new LinearLayout(getContext());
+			FrameLayout fl = new FrameLayout(themedCtx);
+			LinearLayout ll = new LinearLayout(themedCtx);
 			ll.setOrientation(LinearLayout.VERTICAL);
 			ll.setBackgroundResource(app.getSettings().isLightContent() ? R.drawable.bg_card_light : R.drawable.bg_card_dark);
 			fl.addView(ll);
 			((FrameLayout.LayoutParams) ll.getLayoutParams()).setMargins(sideMargin, margin, sideMargin, margin);
 
-			HeaderViewHolder headerViewHolder = new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.list_item_header, parent, false));
+			HeaderViewHolder headerViewHolder = new HeaderViewHolder(LayoutInflater.from(themedCtx).inflate(R.layout.list_item_header, parent, false));
 			bindHeaderViewHolder(headerViewHolder);
 			ll.addView(headerViewHolder.mainView);
 
 			for (int i = 0; i < items.size(); i++) {
 				Object item = getItem(i);
 				if (item instanceof OsmPoint) {
-					OsmEditViewHolder viewHolder = new OsmEditViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.note_list_item, parent, false));
+					OsmEditViewHolder viewHolder = new OsmEditViewHolder(LayoutInflater.from(themedCtx).inflate(R.layout.note_list_item, parent, false));
 					bindOsmEditViewHolder(viewHolder, (OsmPoint) item, i);
 					ll.addView(viewHolder.mainView);
 				}
@@ -269,7 +273,7 @@ public class OsmEditsAdapter extends ArrayAdapter<Object> {
 				}
 			}
 			if (iconResId == 0) {
-				iconResId = R.drawable.ic_type_info;
+				iconResId = R.drawable.ic_action_info_dark;
 			}
 			int colorResId = R.color.color_distance;
 			if (point.getAction() == OsmPoint.Action.CREATE) {
@@ -283,7 +287,7 @@ public class OsmEditsAdapter extends ArrayAdapter<Object> {
 			}
 			return app.getUIUtilities().getIcon(iconResId, colorResId);
 		} else if (point.getGroup() == OsmPoint.Group.BUG) {
-			return app.getUIUtilities().getIcon(R.drawable.ic_type_bug, R.color.color_distance);
+			return app.getUIUtilities().getIcon(R.drawable.ic_action_bug_dark, R.color.color_distance);
 		}
 		return null;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
index a7b6f03356..6812af21c0 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
@@ -120,9 +120,9 @@ public class OsmEditsFragment extends OsmAndListFragment implements SendPoiDialo
 		String name = OsmEditingPlugin.getEditName(child);
 		viewName.setText(name);
 		if (child.getGroup() == Group.POI) {
-			icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_type_info, R.color.color_distance));
+			icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_info_dark, R.color.color_distance));
 		} else if (child.getGroup() == Group.BUG) {
-			icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_type_bug, R.color.color_distance));
+			icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_bug_dark, R.color.color_distance));
 		}
 
 		TextView descr = (TextView) v.findViewById(R.id.description);
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index 6dbe8f0e16..c2766ca4ba 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -9,6 +9,7 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -384,11 +385,11 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 						}
 					}
 				});
-				profileViewHolder.moveIcon.setVisibility(mode.isDeleted() ? View.GONE : View.VISIBLE);
+				profileViewHolder.moveButton.setVisibility(mode.isDeleted() ? View.GONE : View.VISIBLE);
 				if (!mode.isDeleted()) {
 					int removeIconColor = mode.isCustomProfile() ? R.color.color_osm_edit_delete : R.color.icon_color_default_light;
 					profileViewHolder.actionIcon.setImageDrawable(uiUtilities.getIcon(R.drawable.ic_action_remove, removeIconColor));
-					profileViewHolder.moveIcon.setOnTouchListener(new View.OnTouchListener() {
+					profileViewHolder.moveButton.setOnTouchListener(new View.OnTouchListener() {
 						@Override
 						public boolean onTouch(View view, MotionEvent event) {
 							if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
@@ -479,6 +480,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 			ImageButton actionIcon;
 			ImageView moveIcon;
 			View itemsContainer;
+			FrameLayout moveButton;
 
 			ProfileViewHolder(View itemView) {
 				super(itemView);
@@ -487,6 +489,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 				actionIcon = itemView.findViewById(R.id.action_icon);
 				icon = itemView.findViewById(R.id.icon);
 				moveIcon = itemView.findViewById(R.id.move_icon);
+				moveButton = itemView.findViewById(R.id.move_button);
 				itemsContainer = itemView.findViewById(R.id.selectable_list_item);
 			}
 
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
index cc8047f834..7aeceda29f 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
@@ -403,7 +403,7 @@ public class QuickActionListFragment extends BaseOsmAndFragment implements Quick
                 closeBtn = (ImageView) itemView.findViewById(R.id.closeImageButton);
                 container = itemView.findViewById(R.id.searchListItemLayout);
 
-                handleView.setImageDrawable(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_reorder));
+                handleView.setImageDrawable(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_item_move));
                 closeBtn.setImageDrawable(getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_action_remove_dark));
             }
         }
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java
index d6501fddb1..a0b1ad1d55 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java
@@ -25,7 +25,7 @@ public class ShowHideGpxTracksAction extends QuickAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(28,
 			"gpx.showhide", ShowHideGpxTracksAction.class).
-			nameRes(R.string.quick_action_show_hide_gpx_tracks).iconRes(R.drawable.ic_gpx_track).nonEditable().
+			nameRes(R.string.quick_action_show_hide_gpx_tracks).iconRes(R.drawable.ic_action_polygom_dark).nonEditable().
 			category(QuickActionType.CONFIGURE_MAP);
 
 
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
index 7b2a5bfc86..f244fe0f4c 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHidePoiAction.java
@@ -40,7 +40,7 @@ public class ShowHidePoiAction extends QuickAction {
 
 	public static final QuickActionType TYPE = new QuickActionType(5,
 			"poi.showhide", ShowHidePoiAction.class).
-			nameRes(R.string.quick_action_showhide_poi_title).iconRes(R.drawable.ic_action_gabout_dark).
+			nameRes(R.string.quick_action_showhide_poi_title).iconRes(R.drawable.ic_action_info_dark).
 			category(QuickActionType.CONFIGURE_MAP);
 
 
diff --git a/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java b/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
index 26d5a82cce..017addaf35 100644
--- a/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
+++ b/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
@@ -8,6 +8,7 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
@@ -17,11 +18,22 @@ import net.osmand.plus.R.drawable;
 
 import org.apache.commons.logging.Log;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringWriter;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Scanner;
 
 public class RenderingIcons {
 	private static final Log log = PlatformUtil.getLog(RenderingIcons.class);
@@ -34,7 +46,7 @@ public class RenderingIcons {
 //	private static DisplayMetrics dm;
 
 	private static Bitmap cacheBmp = null;
-	
+
 	public static boolean containsSmallIcon(String s){
 		return smallIcons.containsKey(s);
 	}
@@ -44,7 +56,7 @@ public class RenderingIcons {
 	}
 
 	public static synchronized Bitmap getBitmapFromVectorDrawable(Context context, int drawableId) {
-		Drawable drawable = ContextCompat.getDrawable(context, drawableId);
+		Drawable drawable = AppCompatResources.getDrawable(context, drawableId);
 		if (drawable == null) {
 			return null;
 		}
@@ -134,7 +146,7 @@ public class RenderingIcons {
 	public static Drawable getBigIcon(Context ctx, String s) {
 		Integer resId = bigIcons.get(s);
 		if (resId != null) {
-			return ctx.getResources().getDrawable(resId);
+			return AppCompatResources.getDrawable(ctx, resId);
 		}
 		return null;
 	}
@@ -175,7 +187,7 @@ public class RenderingIcons {
 		if (d == null) {
 			Integer drawableId = s.startsWith("h_") ? shaderIcons.get(s.substring(2)) : smallIcons.get(s);
 			if (drawableId != null) {
-				d = ContextCompat.getDrawable(ctx, drawableId);
+				d = AppCompatResources.getDrawable(ctx, drawableId);
 				if (d != null) {
 					d = DrawableCompat.wrap(d);
 					d.mutate();
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
index eee79c7f63..05534b6a91 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
@@ -24,6 +24,7 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -1767,7 +1768,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 			int locationIconResByStatus = OsmAndLocationProvider.isLocationPermissionAvailable(mapActivity) && loc != null
 					? R.drawable.ic_action_location_color : R.drawable.ic_action_location_color_lost;
 
-			((ImageView) parentView.findViewById(R.id.fromIcon)).setImageDrawable(ContextCompat.getDrawable(mapActivity,
+			((ImageView) parentView.findViewById(R.id.fromIcon)).setImageDrawable(AppCompatResources.getDrawable(mapActivity,
 					mapActivity.getMyApplication().getTargetPointsHelper().getPointToStart() == null
 						? locationIconResByStatus : R.drawable.list_startpoint));
 		}
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java
index 8f40582bdc..cddb0cd0a5 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowAlongTheRouteBottomSheet.java
@@ -16,6 +16,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -117,7 +118,7 @@ public class ShowAlongTheRouteBottomSheet extends MenuBottomSheetDialogFragment
 
 		items.add(new SimpleDividerItem(app));
 
-		Drawable transparent = ContextCompat.getDrawable(ctx, R.color.color_transparent);
+		Drawable transparent = AppCompatResources.getDrawable(ctx, R.color.color_transparent);
 		adapter = new ExpandableListAdapter(ctx, contentItem);
 		expListView = new ExpandableListView(ctx);
 		expListView.setAdapter(adapter);
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
index b4b090442d..30da3fa575 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
@@ -230,6 +230,7 @@ public class RouteCalculationResult {
 						RouteDirectionInfo info = new RouteDirectionInfo(localDirections.get(currentDirection).getAverageSpeed(), TurnType.straight());
 						info.setRef(toSplit.getRef());
 						info.setStreetName(toSplit.getStreetName());
+						info.setRouteDataObject(toSplit.getRouteDataObject());
 						info.setDestinationName(toSplit.getDestinationName());
 						info.routePointOffset = interLocations[currentIntermediate];
 						info.setDescriptionRoute(ctx.getString(R.string.route_head));//; //$NON-NLS-1$
@@ -412,32 +413,17 @@ public class RouteCalculationResult {
 
 					if (ref != null) {
 						RouteDataObject nextRoad = next.getObject();
-						boolean isNextShieldFound = false;
-						int[] nextSegmentNameIds = nextRoad.nameIds;
-						for (int nm = 0; nm < nextSegmentNameIds.length; nm++) {
-							if (nextRoad.region.quickGetEncodingRule(nextSegmentNameIds[nm]).getTag().startsWith("road_ref")) {
-								info.setRouteDataObject(nextRoad);
-								isNextShieldFound = true;
-							}
-						}
+						info.setRouteDataObject(nextRoad);
 
-						if (!isNextShieldFound) {
-							for (int ind = lind; ind < list.size(); ind++) {
-								if (list.get(ind).getTurnType() != null) {
-									info.setRouteDataObject(null);
-									break;
-								} else {
-									RouteDataObject obj = list.get(ind).getObject();
-									int[] nameIds = obj.nameIds;
-									for (int idx = 0; idx < nameIds.length; idx ++) {
-										if (obj.region.routeEncodingRules.get(obj.nameIds[idx]).getTag().startsWith("road_ref")) {
-											info.setRouteDataObject(obj);
-											break;
-										}
-									}
-									if (info.getRouteDataObject() != null) {
-										break;
-									}
+						boolean isNextShieldFound = nextRoad.hasNameTagStartsWith("road_ref");
+						for (int ind = lind; ind < list.size() && !isNextShieldFound; ind++) {
+							if (list.get(ind).getTurnType() != null) {
+								isNextShieldFound = true;
+							} else {
+								RouteDataObject obj = list.get(ind).getObject();
+								if (obj.hasNameTagStartsWith("road_ref")) {
+									info.setRouteDataObject(obj);
+									isNextShieldFound = true;
 								}
 							}
 						}
@@ -787,6 +773,7 @@ public class RouteCalculationResult {
 			if (segs != null) {
 				RouteSegmentResult lastSegmentResult = segs.get(segs.size() - 1);
 				RouteDataObject routeDataObject = lastSegmentResult.getObject();
+				info.setRouteDataObject(routeDataObject);
 				info.setRef(routeDataObject.getRef(ctx.getSettings().MAP_PREFERRED_LOCALE.get(),
 						ctx.getSettings().MAP_TRANSLITERATE_NAMES.get(), lastSegmentResult.isForwardDirection()));
 				info.setStreetName(routeDataObject.getName(ctx.getSettings().MAP_PREFERRED_LOCALE.get(),
@@ -1143,6 +1130,7 @@ public class RouteCalculationResult {
 						p = new RouteDirectionInfo(i.getAverageSpeed(), i.getTurnType());
 						p.routePointOffset = i.routePointOffset;
 						p.routeEndPointOffset = i.routeEndPointOffset;
+						p.setRouteDataObject(i.getRouteDataObject());
 						p.setDestinationName(i.getDestinationName());
 						p.setRef(i.getRef());
 						p.setStreetName(i.getStreetName());
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index 3d3c75dd5c..353dd7b0e8 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -480,7 +480,7 @@ public class RouteProvider {
 						ch.routeEndPointOffset = info.routeEndPointOffset - startI[0];
 					}
 					ch.setDescriptionRoute(info.getDescriptionRoutePart());
-
+					ch.setRouteDataObject(info.getRouteDataObject());
 					// Issue #2894
 					if (info.getRef() != null && !"null".equals(info.getRef())) {
 						ch.setRef(info.getRef());
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 351fc805a6..385a31ec74 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -45,6 +45,11 @@ public class RoutingHelper {
 	private static final int CACHE_RADIUS = 100000;
 	public static final float ALLOWED_DEVIATION = 2;
 
+	// This should be correlated with RoutingHelper.updateCurrentRouteStatus ( when processed turn now is not announced)
+	private static int DEFAULT_GPS_TOLERANCE = 12;
+	public static int GPS_TOLERANCE = DEFAULT_GPS_TOLERANCE;
+	public static float ARRIVAL_DISTANCE_FACTOR = 1;
+
 	private List<WeakReference<IRouteInformationListener>> listeners = new LinkedList<>();
 	private List<WeakReference<IRoutingDataUpdateListener>> updateListeners = new LinkedList<>();
 	private OsmandApplication app;
@@ -260,6 +265,8 @@ public class RoutingHelper {
 
 	public void setAppMode(ApplicationMode mode){
 		this.mode = mode;
+		ARRIVAL_DISTANCE_FACTOR = Math.max(settings.ARRIVAL_DISTANCE_FACTOR.getModeValue(mode), 0.1f);
+		GPS_TOLERANCE = (int) (DEFAULT_GPS_TOLERANCE * ARRIVAL_DISTANCE_FACTOR);
 		voiceRouter.updateAppMode();
 	}
 
@@ -482,7 +489,7 @@ public class RoutingHelper {
 						voiceRouter.interruptRouteCommands();
 						voiceRouterStopped = true; // Prevents excessive execution of stop() code
 					}
-					if (distOrth > mode.getOffRouteDistance() && !settings.DISABLE_OFFROUTE_RECALC.get()) {
+					if (distOrth > mode.getOffRouteDistance() * ARRIVAL_DISTANCE_FACTOR && !settings.DISABLE_OFFROUTE_RECALC.get()) {
 						voiceRouter.announceOffRoute(distOrth);
 					}
 				}
@@ -580,8 +587,8 @@ public class RoutingHelper {
 					}
 					processed = true;
 				}
-			} else if (newDist < dist || newDist < 10) {
-				// newDist < 10 (avoid distance 0 till next turn)
+			} else if (newDist < dist || newDist < GPS_TOLERANCE / 2) {
+				// newDist < GPS_TOLERANCE (avoid distance 0 till next turn)
 				if (dist > posTolerance) {
 					processed = true;
 					if (log.isDebugEnabled()) {
@@ -729,7 +736,14 @@ public class RoutingHelper {
 	}
 
 	private float getArrivalDistance() {
-		return ((float)settings.getApplicationMode().getArrivalDistance()) * settings.ARRIVAL_DISTANCE_FACTOR.get();
+		ApplicationMode m = mode == null ? settings.getApplicationMode() : mode;
+		float defaultSpeed = Math.max(0.3f, m.getDefaultSpeed());
+
+		/// Used to be: car - 90 m, bicycle - 50 m, pedestrian - 20 m
+		// return ((float)settings.getApplicationMode().getArrivalDistance()) * settings.ARRIVAL_DISTANCE_FACTOR.getModeValue(m);
+		// GPS_TOLERANCE - 12 m
+		// 5 seconds: car - 80 m @ 50 kmh, bicyle - 45 m @ 25 km/h, bicyle - 25 m @ 10 km/h, pedestrian - 18 m @ 4 km/h,
+		return GPS_TOLERANCE + defaultSpeed * 5 * ARRIVAL_DISTANCE_FACTOR;
 	}
 
 
@@ -941,7 +955,7 @@ public class RoutingHelper {
 			next[0] = n.directionInfo.getTurnType();
 		}
 		if(n.distanceTo > 0  && n.directionInfo != null && !n.directionInfo.getTurnType().isSkipToSpeak() &&
-				voiceRouter.isDistanceLess(speed, n.distanceTo, voiceRouter.PREPARE_DISTANCE * 0.75f, 0f)) {
+				voiceRouter.isDistanceLess(speed, n.distanceTo, voiceRouter.PREPARE_DISTANCE * 0.75f)) {
 			String nm = n.directionInfo.getStreetName();
 			String rf = n.directionInfo.getRef();
 			String dn = n.directionInfo.getDestinationName();
diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
index 1a3f90e196..ebaa8a0baf 100644
--- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
+++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
@@ -42,6 +42,7 @@ public class VoiceRouter {
 	private static final int STATUS_TURN_IN = 3;
 	private static final int STATUS_TURN = 4;
 	private static final int STATUS_TOLD = 5;
+
 	public static final String TO_REF = "toRef";
 	public static final String TO_STREET_NAME = "toStreetName";
 	public static final String TO_DEST = "toDest";
@@ -49,39 +50,39 @@ public class VoiceRouter {
 	public static final String FROM_STREET_NAME = "fromStreetName";
 	public static final String FROM_DEST = "fromDest";
 
-	protected static CommandPlayer player;
+	protected CommandPlayer player;
 
 	protected final OsmandApplication app;
 	protected final RoutingHelper router;
 	protected OsmandSettings settings;
 
-	private static int currentStatus = STATUS_UNKNOWN;
-	private static boolean playedAndArriveAtTarget = false;
-	private static float playGoAheadDist = 0;
-	private static long lastAnnouncedSpeedLimit = 0;
-	private static long waitAnnouncedSpeedLimit = 0;
-	private static long lastAnnouncedOffRoute = 0;
-	private static long waitAnnouncedOffRoute = 0;
-	private static boolean suppressDest = false;
-	private static boolean announceBackOnRoute = false;
-	// private static long lastTimeRouteRecalcAnnounced = 0;
+	private int currentStatus = STATUS_UNKNOWN;
+	private boolean playedAndArriveAtTarget = false;
+	private float playGoAheadDist = 0;
+	private long lastAnnouncedSpeedLimit = 0;
+	private long waitAnnouncedSpeedLimit = 0;
+	private long lastAnnouncedOffRoute = 0;
+	private long waitAnnouncedOffRoute = 0;
+	private boolean suppressDest = false;
+	private boolean announceBackOnRoute = false;
+	// private long lastTimeRouteRecalcAnnounced = 0;
 	// Remember when last announcement was made
-	private static long lastAnnouncement = 0;
+	private  long lastAnnouncement = 0;
 
 	// Default speed to have comfortable announcements (Speed in m/s)
 	private float DEFAULT_SPEED = 12;
-	private float TURN_DEFAULT_SPEED = 5;
+	private float TURN_NOW_SPEED;
 		
-	private int PREPARE_LONG_DISTANCE = 0;
-	private int PREPARE_LONG_DISTANCE_END = 0;
-	protected int PREPARE_DISTANCE = 0;
-	private int PREPARE_DISTANCE_END = 0;
-	private int TURN_IN_DISTANCE = 0;
-	private int TURN_IN_DISTANCE_END = 0;
-	private int TURN_DISTANCE = 0;
+	private int PREPARE_LONG_DISTANCE;
+	private int PREPARE_LONG_DISTANCE_END;
+	protected int PREPARE_DISTANCE;
+	private int PREPARE_DISTANCE_END;
+	private int TURN_IN_DISTANCE;
+	private int TURN_IN_DISTANCE_END;
+	private int TURN_NOW_DISTANCE;
 	
-	private static VoiceCommandPending pendingCommand = null;
-	private static RouteDirectionInfo nextRouteDirection;
+	private VoiceCommandPending pendingCommand = null;
+	private RouteDirectionInfo nextRouteDirection;
 
 	public interface VoiceMessageListener {
 		void onVoiceMessage(List<String> listCommands, List<String> played);
@@ -93,6 +94,7 @@ public class VoiceRouter {
 		this.router = router;
 		this.app = router.getApplication();
 		this.settings = app.getSettings();
+		updateAppMode();
 
 		OsmAndAppCustomizationListener customizationListener = new OsmAndAppCustomizationListener() {
 			@Override
@@ -104,7 +106,7 @@ public class VoiceRouter {
 	}
 	
 	public void setPlayer(CommandPlayer player) {
-		VoiceRouter.player = player;
+		this.player = player;
 		if (pendingCommand != null && player != null) {
 			CommandBuilder newCommand = getNewCommandPlayerToPlay();
 			if (newCommand != null) {
@@ -142,66 +144,76 @@ public class VoiceRouter {
 		return player.newCommandBuilder();
 	}
 
+
 	public void updateAppMode() {
-		// Turn prompt starts either at distance, or additionally (TURN_IN and TURN only) if actual-lead-time(currentSpeed) < maximum-lead-time(defined by default speed)
-		if (router.getAppMode().isDerivedRoutingFrom(ApplicationMode.CAR)) {
-			PREPARE_LONG_DISTANCE = 3500;             // [105 sec @ 120 km/h]
-			// Issue 1411: Do not play prompts for PREPARE_LONG_DISTANCE, not needed.
-			PREPARE_LONG_DISTANCE_END = 3000 + 1000;  // [ 90 sec @ 120 km/h]
-			PREPARE_DISTANCE = 1500;                  // [125 sec]
-			PREPARE_DISTANCE_END = 1200;      	  // [100 sec]
-			TURN_IN_DISTANCE = 300;			  //   23 sec
-			TURN_IN_DISTANCE_END = 210;               //   16 sec
-			TURN_DISTANCE = 50;                       //    7 sec
-			TURN_DEFAULT_SPEED = 7f;                  //   25 km/h
-			DEFAULT_SPEED = 13;                       //   48 km/h
-		} else if (router.getAppMode().isDerivedRoutingFrom(ApplicationMode.BICYCLE)) {
-			PREPARE_LONG_DISTANCE = 500;              // [100 sec]
-			// Do not play:
-			PREPARE_LONG_DISTANCE_END = 300 + 1000;   // [ 60 sec]
-			PREPARE_DISTANCE = 200;                   // [ 40 sec]
-			PREPARE_DISTANCE_END = 120;               // [ 24 sec]
-			TURN_IN_DISTANCE = 80;                    //   16 sec
-			TURN_IN_DISTANCE_END = 60;                //   12 sec
-			TURN_DISTANCE = 30;                       //    6 sec. Check if this works with GPS accuracy!
-			TURN_DEFAULT_SPEED = DEFAULT_SPEED = 5;   //   18 km/h
-		} else if (router.getAppMode().isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) {
-			// prepare_long_distance warning not needed for pedestrian, but for goAhead prompt
-			PREPARE_LONG_DISTANCE = 500;
-			// Do not play:
-			PREPARE_LONG_DISTANCE_END = 300 + 300;
-			// Prepare distance is not needed for pedestrian
-			PREPARE_DISTANCE = 200;                    // [100 sec]
-			// Do not play:
-			PREPARE_DISTANCE_END = 150 + 100;          // [ 75 sec]
-			TURN_IN_DISTANCE = 50;                     //   25 sec
-			TURN_IN_DISTANCE_END = 30;                 //   15 sec
-			TURN_DISTANCE = 15;                        //   7,5sec. Check if this works with GPS accuracy!
-			TURN_DEFAULT_SPEED = DEFAULT_SPEED = 2f;   //   7,2 km/h
+		ApplicationMode appMode = router.getAppMode() == null ? settings.getApplicationMode() : router.getAppMode();
+		if (appMode.isDerivedRoutingFrom(ApplicationMode.CAR)) {
+			// could be changed in future as others by default in settings is 45 kmh
+			DEFAULT_SPEED = 14;                       //   ~50 km/h
+			//DEFAULT speed is configurable
+//		} else if (router.getAppMode().isDerivedRoutingFrom(ApplicationMode.BICYCLE)) {
+//			DEFAULT_SPEED = 2.77f;   //   10 km/h
+//		} else if (router.getAppMode().isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) {
+//			DEFAULT_SPEED = 1.11f; //4 km/h 2f;     // 7,2 km/h
 		} else {
-			DEFAULT_SPEED = router.getAppMode().getDefaultSpeed();
-			TURN_DEFAULT_SPEED = DEFAULT_SPEED / 2;
-			PREPARE_LONG_DISTANCE = (int) (DEFAULT_SPEED * 270);
-			// Do not play:
-			PREPARE_LONG_DISTANCE_END = (int) (DEFAULT_SPEED * 230) * 2;
-			PREPARE_DISTANCE = (int) (DEFAULT_SPEED * 115);
-			PREPARE_DISTANCE_END = (int) (DEFAULT_SPEED * 92);
-			TURN_IN_DISTANCE = (int) (DEFAULT_SPEED * 23);
-			TURN_IN_DISTANCE_END = (int) (DEFAULT_SPEED * 16);
-			TURN_DISTANCE = (int) (DEFAULT_SPEED * 7);
+			// minimal is 1 meter for turn now
+			DEFAULT_SPEED = (float) Math.max(0.3, appMode.getDefaultSpeed());
 		}
+
+
+		// Do not play [issue 1411]: prepare_long_distance warning not needed, used only for goAhead prompt
+		// 300 sec: 4 200 - 3 500 m - car [ 115 - 95 sec @ 120 km/h]
+		PREPARE_LONG_DISTANCE = (int) (DEFAULT_SPEED * 300);
+		PREPARE_LONG_DISTANCE_END = (int) (DEFAULT_SPEED * 250) ;
+
+		if (DEFAULT_SPEED < 30) {
+//		if (PREPARE_LONG_DISTANCE_END - PREPARE_DISTANCE < 4000) {
+			// Play only for high speed vehicle with speed > 110 km/h
+			PREPARE_DISTANCE_END = PREPARE_DISTANCE * 2;
+		}
+
+		// *#8749: Here the change for bicycle: 40-30 sec, 200-150 m -> 115-90 sec, 320-250m [ need to be tested ]
+		// 115 sec: 1 500 m - car [45 sec @ 120 km/h], 320 m - bicycle [45 sec @ 25 km/h], 230 m - pedestrian
+		PREPARE_DISTANCE = (int) (DEFAULT_SPEED * 115);
+		// 90  sec: 1 200 m - car, 250 m - bicycle [36 sec @ 25 km/h],
+		PREPARE_DISTANCE_END = (int) (DEFAULT_SPEED * 90);
+
+		// 22 sec: 310 m - car, 60 m - bicycle, 50m - pedestrian
+		TURN_IN_DISTANCE = (int) (DEFAULT_SPEED  * 22);
+		// 15 sec: 210 m - car, 40 m - bicycle, 30 m - pedestrian
+		TURN_IN_DISTANCE_END = (int) (DEFAULT_SPEED * 15);
+
+		// same as speed < 150/(90-22) m/s = 2.2 m/s = 8 km/h
+		if (PREPARE_DISTANCE_END - TURN_IN_DISTANCE < 150) {
+			// Do not play: for pedestrian and slow transport
+			PREPARE_DISTANCE_END = PREPARE_DISTANCE * 2;
+		}
+
+		// Turn now: 3.5 sec normal speed, 7 second for halfspeed (default)
+		// float TURN_NOW_TIME = 7;
+
+		// ** #8749 to keep 1m / 1 sec precision (GPS_TOLERANCE - 12 m)
+		// 1 kmh - 1 m, 4 kmh - 4 m (pedestrian), 10 kmh - 10 m (bicycle), 50 kmh - 50 m (car)
+		// TURN_NOW_DISTANCE = (int) (DEFAULT_SPEED * 3.6); // 3.6 sec
+		// 50 kmh - 48 m (car), 10 kmh - 20 m, 4 kmh - 15 m, 1 kmh - 12 m
+		TURN_NOW_DISTANCE = (int) (RoutingHelper.GPS_TOLERANCE + DEFAULT_SPEED * 2.5 * RoutingHelper.ARRIVAL_DISTANCE_FACTOR); // 3.6 sec
+		// 1 kmh - 1 sec, 4 kmh - 2 sec (pedestrian), 10 kmh - 3 sec (*bicycle), 50 kmh - 7 sec (car)
+		float TURN_NOW_TIME = (float) Math.min(Math.sqrt(DEFAULT_SPEED * 3.6), 8);
+
+		TURN_NOW_SPEED = TURN_NOW_DISTANCE / TURN_NOW_TIME;
 	}
 
 	private double voicePromptDelayDistance = 0;
 
-	public boolean isDistanceLess(float currentSpeed, double dist, double etalon, float defSpeed) {
-		if (defSpeed <= 0) {
-			defSpeed = DEFAULT_SPEED;
-		}
+	public boolean isDistanceLess(float currentSpeed, double dist, double etalon) {
+		return isDistanceLess(currentSpeed, dist, etalon, DEFAULT_SPEED);
+	}
+
+
+	private boolean isDistanceLess(float currentSpeed, double dist, double etalon, float defSpeed) {
 		if (currentSpeed <= 0) {
 			currentSpeed = DEFAULT_SPEED;
 		}
-
 		// Trigger close prompts earlier to allow BT SCO link being established, or when VOICE_PROMPT_DELAY is set >0 for the other stream types
 		int ams = settings.AUDIO_MANAGER_STREAM.getModeValue(router.getAppMode());
 		if ((ams == 0 && !AbstractPrologCommandPlayer.btScoStatus) || ams > 0) {
@@ -210,7 +222,8 @@ public class VoiceRouter {
 			}
 		}
 
-		if ((dist < etalon + voicePromptDelayDistance) || ((dist - voicePromptDelayDistance) / currentSpeed) < (etalon / defSpeed)) {
+		if (dist - voicePromptDelayDistance < etalon ||
+				(dist - voicePromptDelayDistance) / currentSpeed < etalon / defSpeed) {
 			return true;
 		}
 		return false;
@@ -221,7 +234,7 @@ public class VoiceRouter {
 		if (loc != null && loc.hasSpeed()) {
 			speed = loc.getSpeed();
 		}
-		if (isDistanceLess(speed, dist, TURN_DISTANCE, 0f)) {
+		if (isDistanceLess(speed, dist, TURN_NOW_DISTANCE)) {
 			return 0;
 		} else if (dist <= PREPARE_DISTANCE) {
 			return 1;
@@ -444,7 +457,7 @@ public class VoiceRouter {
 		// < PREPARE_LONG_DISTANCE (e.g. 3500m):         playPrepareTurn (-not played any more-)
 		// < PREPARE_DISTANCE      (e.g. 1500m):         playPrepareTurn ("Turn after ...")
 		// < TURN_IN_DISTANCE      (e.g. 390m or 30sec): playMakeTurnIn  ("Turn in ...")
-		// < TURN_DISTANCE         (e.g. 50m or 7sec):   playMakeTurn    ("Turn ...")
+		// < TURN_NOW_DISTANCE         (e.g. 50m or 7sec):   playMakeTurn    ("Turn ...")
 		float speed = DEFAULT_SPEED;
 		if (currentLocation != null && currentLocation.hasSpeed()) {
 			speed = Math.max(currentLocation.getSpeed(), speed);
@@ -486,7 +499,7 @@ public class VoiceRouter {
 		if (currentStatus == STATUS_UNKNOWN) {
 			// Play "Continue for ..." if (1) after route calculation no other prompt is due, or (2) after a turn if next turn is more than PREPARE_LONG_DISTANCE away
 			if ((playGoAheadDist == -1) || (dist > PREPARE_LONG_DISTANCE)) {
-				playGoAheadDist = dist - 3 * TURN_DISTANCE;
+				playGoAheadDist = dist - 3 * TURN_NOW_DISTANCE;
 			}
 		}
 
@@ -494,7 +507,7 @@ public class VoiceRouter {
 		// Note: getNextRouteDirectionInfoAfter(nextInfo, x, y).distanceTo is distance from nextInfo, not from current position!
 
 		// STATUS_TURN = "Turn (now)"
-		if ((repeat || statusNotPassed(STATUS_TURN)) && isDistanceLess(speed, dist, TURN_DISTANCE, TURN_DEFAULT_SPEED)) {
+		if ((repeat || statusNotPassed(STATUS_TURN)) && isDistanceLess(speed, dist, TURN_NOW_DISTANCE, TURN_NOW_SPEED)) {
 			if (nextNextInfo.distanceTo < TURN_IN_DISTANCE_END && nextNextInfo != null) {
 				playMakeTurn(currentSegment, next, nextNextInfo);
 			} else {
@@ -519,9 +532,9 @@ public class VoiceRouter {
 			nextStatusAfter(STATUS_TURN);
 
 		// STATUS_TURN_IN = "Turn in ..."
-		} else if ((repeat || statusNotPassed(STATUS_TURN_IN)) && isDistanceLess(speed, dist, TURN_IN_DISTANCE, 0f)) {
+		} else if ((repeat || statusNotPassed(STATUS_TURN_IN)) && isDistanceLess(speed, dist, TURN_IN_DISTANCE)) {
 			if (repeat || dist >= TURN_IN_DISTANCE_END) {
-				if ((isDistanceLess(speed, nextNextInfo.distanceTo, TURN_DISTANCE, 0f) || nextNextInfo.distanceTo < TURN_IN_DISTANCE_END) &&
+				if ((isDistanceLess(speed, nextNextInfo.distanceTo, TURN_NOW_DISTANCE) || nextNextInfo.distanceTo < TURN_IN_DISTANCE_END) &&
 						nextNextInfo != null) {
 					playMakeTurnIn(currentSegment, next, dist - (int) voicePromptDelayDistance, nextNextInfo.directionInfo);
 				} else {
@@ -664,7 +677,7 @@ public class VoiceRouter {
 		return  speakablePointName == null ? "" : speakablePointName;
 	}
 
-	private static String getSpeakablePointName(String pn) {
+	private String getSpeakablePointName(String pn) {
 		// Replace characters which may produce unwanted TTS sounds:
 		String pl = "";
 		if (player != null) {
@@ -706,7 +719,7 @@ public class VoiceRouter {
 		play(p);
 	}
 
-	private static String getSpeakableExitRef(String exit) {
+	private String getSpeakableExitRef(String exit) {
 		StringBuilder sb = new StringBuilder();
 		if (exit != null) {
 			exit = exit.replace('-', ' ');
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index 7a003e81d5..4637f95455 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -1507,7 +1507,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 	private void reloadHistoryInternal() {
 		if (historySearchFragment != null) {
 			try {
-				SearchResultCollection res = searchUICore.shallowSearch(SearchHistoryAPI.class, "", null);
+				SearchResultCollection res = searchUICore.shallowSearch(SearchHistoryAPI.class, "", null, false, false);
 				List<QuickSearchListItem> rows = new ArrayList<>();
 				if (res != null) {
 					for (SearchResult sr : res.getCurrentSearchResults()) {
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
index 6ab46f14fc..57c35d79dc 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchListAdapter.java
@@ -411,7 +411,7 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 					int colorId = worksNow ? worksLater ? R.color.color_ok : R.color.color_intermediate : R.color.color_warning;
 
 					timeLayout.setVisibility(View.VISIBLE);
-					timeIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_small_time, colorId));
+					timeIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_time_16, colorId));
 					timeText.setTextColor(app.getResources().getColor(colorId));
 					String rt = amenity.isClosed() ? app.getResources().getString(R.string.poi_operational_status_closed) : rs.getCurrentRuleTime(inst);
 					timeText.setText(rt == null ? "" : rt);
diff --git a/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java b/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
index 7b25eab016..fd29d60596 100644
--- a/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
+++ b/OsmAnd/src/net/osmand/plus/search/listitems/QuickSearchListItem.java
@@ -262,12 +262,12 @@ public class QuickSearchListItem {
 		switch (searchResult.objectType) {
 			case FAVORITE:
 			case FAVORITE_GROUP:
-				return app.getUIUtilities().getThemedIcon(R.drawable.ic_small_group);
+				return app.getUIUtilities().getThemedIcon(R.drawable.ic_action_group_name_16);
 			case RECENT_OBJ:
 				HistoryEntry historyEntry = (HistoryEntry) searchResult.object;
 				String typeName = historyEntry.getName().getTypeName();
 				if (typeName != null && !typeName.isEmpty()) {
-					return app.getUIUtilities().getThemedIcon(R.drawable.ic_small_group);
+					return app.getUIUtilities().getThemedIcon(R.drawable.ic_action_group_name_16);
 				} else {
 					return null;
 				}
diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
index 6d7ab4562d..6bba4b91e6 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java
@@ -341,6 +341,9 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
 						}
 					} else {
 						hiddenMenuItems.remove(id);
+						if (screenType == ScreenType.CONTEXT_MENU_ACTIONS && mainActionItems.size() < MAIN_BUTTONS_QUANTITY) {
+							mainActionItems.add(id);
+						}
 					}
 					wasReset = false;
 					isChanged = true;
diff --git a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java
index ea3c4ee53e..d3aed385f0 100644
--- a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java
@@ -118,7 +118,7 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter<RecyclerView
 				PoiUIFilter filter = (PoiUIFilter) currentItem;
 				itemHolder.title.setText(filter.getName());
 				int iconRes = RenderingIcons.getBigIconResourceId(filter.getIconId());
-				itemHolder.icon.setImageDrawable(uiUtilities.getIcon(iconRes != 0 ? iconRes : R.drawable.ic_person, activeColorRes));
+				itemHolder.icon.setImageDrawable(uiUtilities.getIcon(iconRes != 0 ? iconRes : R.drawable.ic_action_user, activeColorRes));
 				itemHolder.subTitle.setVisibility(View.GONE);
 			} else if (currentItem instanceof ITileSource) {
 				itemHolder.title.setText(((ITileSource) currentItem).getName());
diff --git a/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java
index 509fb394b7..a9394e6808 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ExportImportSettingsAdapter.java
@@ -216,7 +216,7 @@ class ExportImportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 			case POI_TYPES:
 				title.setText(((PoiUIFilter) currentItem).getName());
 				int iconRes = RenderingIcons.getBigIconResourceId(((PoiUIFilter) currentItem).getIconId());
-				setupIcon(icon, iconRes != 0 ? iconRes : R.drawable.ic_person, itemSelected);
+				setupIcon(icon, iconRes != 0 ? iconRes : R.drawable.ic_action_user, itemSelected);
 				subText.setVisibility(View.GONE);
 				break;
 			case MAP_SOURCES:
diff --git a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
index b9e724a1ae..5473eeecd6 100644
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@@ -26,6 +26,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.Fragment;
@@ -324,7 +325,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		View profileButton = view.findViewById(R.id.profile_button);
 		if (profileButton != null) {
 			int iconColor = ContextCompat.getColor(app, changedProfile.color.getColor(isNightMode()));
-			AndroidUtils.setBackground(profileButton, UiUtilities.tintDrawable(ContextCompat.getDrawable(app,
+			AndroidUtils.setBackground(profileButton, UiUtilities.tintDrawable(AppCompatResources.getDrawable(app,
 					R.drawable.circle_background_light), UiUtilities.getColorWithAlpha(iconColor, 0.1f)));
 			ImageView profileIcon = view.findViewById(R.id.profile_icon);
 			if (profileIcon != null) {
@@ -466,7 +467,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 				.inflate(R.layout.preference_circle_item, rootView, false);
 		ImageView coloredCircle = colorItemView.findViewById(R.id.background);
 		AndroidUtils.setBackground(coloredCircle,
-				UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.circle_background_light),
+				UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.circle_background_light),
 				ContextCompat.getColor(app, colorRes.getColor(isNightMode()))));
 		coloredCircle.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -484,7 +485,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 
 		ImageView outlineCircle = colorItemView.findViewById(R.id.outline);
 		ImageView checkMark = colorItemView.findViewById(R.id.checkMark);
-		GradientDrawable gradientDrawable = (GradientDrawable) ContextCompat.getDrawable(app, R.drawable.circle_contour_bg_light);
+		GradientDrawable gradientDrawable = (GradientDrawable) AppCompatResources.getDrawable(app, R.drawable.circle_contour_bg_light);
 		if (gradientDrawable != null) {
 			gradientDrawable.setStroke(AndroidUtils.dpToPx(app, 2),
 					UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, colorRes.getColor(isNightMode())), 0.3f));
@@ -528,7 +529,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		checkMark.setImageDrawable(app.getUIUtilities().getIcon(iconRes, R.color.icon_color_default_light));
 		ImageView coloredCircle = iconItemView.findViewById(R.id.background);
 		AndroidUtils.setBackground(coloredCircle,
-				UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.circle_background_light),
+				UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.circle_background_light),
 				UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, R.color.icon_color_default_light), 0.1f)));
 		coloredCircle.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -550,7 +551,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		ImageView checkMark = iconItem.findViewById(R.id.checkMark);
 		checkMark.setImageDrawable(app.getUIUtilities().getIcon(changedProfile.iconRes, R.color.icon_color_default_light));
 		AndroidUtils.setBackground(iconItem.findViewById(R.id.background),
-				UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.circle_background_light),
+				UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.circle_background_light),
 						UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, R.color.icon_color_default_light), 0.1f)));
 		changedProfile.iconRes = iconRes;
 		updateProfileButton();
@@ -561,15 +562,17 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 				.inflate(R.layout.preference_select_icon_button, rootView, false);
 		int changedProfileColor = ContextCompat.getColor(app, changedProfile.color.getColor(
 				app.getDaynightHelper().isNightModeForMapControls()));
-		LayerDrawable locationIconDrawable = (LayerDrawable) app.getResources().getDrawable(locationIcon.getIconId());
-		DrawableCompat.setTint(DrawableCompat.wrap(locationIconDrawable.getDrawable(1)), changedProfileColor);
+		LayerDrawable locationIconDrawable = (LayerDrawable) AppCompatResources.getDrawable(app, locationIcon.getIconId());
+		if (locationIconDrawable != null) {
+			DrawableCompat.setTint(DrawableCompat.wrap(locationIconDrawable.getDrawable(1)), changedProfileColor);
+		}
 		locationIconView.<ImageView>findViewById(R.id.icon).setImageDrawable(locationIconDrawable);
 		ImageView headingIcon = locationIconView.findViewById(R.id.headingIcon);
-		headingIcon.setImageDrawable(ContextCompat.getDrawable(app, locationIcon.getHeadingIconId()));
+		headingIcon.setImageDrawable(AppCompatResources.getDrawable(app, locationIcon.getHeadingIconId()));
 		headingIcon.setColorFilter(new PorterDuffColorFilter(changedProfileColor, PorterDuff.Mode.SRC_IN));
 		ImageView coloredRect = locationIconView.findViewById(R.id.backgroundRect);
 		AndroidUtils.setBackground(coloredRect,
-				UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_select_icon_button),
+				UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.bg_select_icon_button),
 						UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, R.color.icon_color_default_light), 0.1f)));
 		coloredRect.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -582,7 +585,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			}
 		});
 		ImageView outlineRect = locationIconView.findViewById(R.id.outlineRect);
-		GradientDrawable rectContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app, R.drawable.bg_select_icon_button_outline);
+		GradientDrawable rectContourDrawable = (GradientDrawable) AppCompatResources.getDrawable(app, R.drawable.bg_select_icon_button_outline);
 		if (rectContourDrawable != null) {
 			rectContourDrawable.setStroke(AndroidUtils.dpToPx(app, 2), changedProfileColor);
 		}
@@ -603,9 +606,11 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 	private View createNavigationIconView(final NavigationIcon navigationIcon, ViewGroup rootView) {
 		FrameLayout navigationIconView = (FrameLayout) UiUtilities.getInflater(getContext(), isNightMode())
 				.inflate(R.layout.preference_select_icon_button, rootView, false);
-		LayerDrawable navigationIconDrawable = (LayerDrawable) app.getResources().getDrawable(navigationIcon.getIconId());
-		DrawableCompat.setTint(DrawableCompat.wrap(navigationIconDrawable.getDrawable(1)),
-				ContextCompat.getColor(app, changedProfile.color.getColor(app.getDaynightHelper().isNightModeForMapControls())));
+		LayerDrawable navigationIconDrawable = (LayerDrawable) AppCompatResources.getDrawable(app, navigationIcon.getIconId());
+		if (navigationIconDrawable != null) {
+			DrawableCompat.setTint(DrawableCompat.wrap(navigationIconDrawable.getDrawable(1)),
+					ContextCompat.getColor(app, changedProfile.color.getColor(app.getDaynightHelper().isNightModeForMapControls())));
+		}
 		ImageView imageView = navigationIconView.findViewById(R.id.icon);
 		imageView.setImageDrawable(navigationIconDrawable);
 		Matrix matrix = new Matrix();
@@ -615,7 +620,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		imageView.setImageMatrix(matrix);
 		ImageView coloredRect = navigationIconView.findViewById(R.id.backgroundRect);
 		AndroidUtils.setBackground(coloredRect,
-				UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.bg_select_icon_button),
+				UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.bg_select_icon_button),
 						UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, R.color.icon_color_default_light), 0.1f)));
 		coloredRect.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -628,7 +633,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			}
 		});
 		ImageView outlineRect = navigationIconView.findViewById(R.id.outlineRect);
-		GradientDrawable rectContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app, R.drawable.bg_select_icon_button_outline);
+		GradientDrawable rectContourDrawable = (GradientDrawable) AppCompatResources.getDrawable(app, R.drawable.bg_select_icon_button_outline);
 		int changedProfileColor = ContextCompat.getColor(app, changedProfile.color.getColor(
 				app.getDaynightHelper().isNightModeForMapControls()));
 		if (rectContourDrawable != null) {
@@ -660,10 +665,10 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		View iconItem = iconItems.findViewWithTag(iconRes);
 		if (iconItem != null) {
 			AndroidUtils.setBackground(iconItem.findViewById(R.id.background),
-					UiUtilities.tintDrawable(ContextCompat.getDrawable(app, R.drawable.circle_background_light),
+					UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.circle_background_light),
 							UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, changedProfile.color.getColor(isNightMode())), 0.1f)));
 			ImageView outlineCircle = iconItem.findViewById(R.id.outline);
-			GradientDrawable circleContourDrawable = (GradientDrawable) ContextCompat.getDrawable(app, R.drawable.circle_contour_bg_light);
+			GradientDrawable circleContourDrawable = (GradientDrawable) AppCompatResources.getDrawable(app, R.drawable.circle_contour_bg_light);
 			if (circleContourDrawable != null) {
 				circleContourDrawable.setStroke(AndroidUtils.dpToPx(app, 2), changedProfileColor);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java
index 6e1452343a..a365e684c8 100644
--- a/OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/RearrangeMenuItemsAdapter.java
@@ -155,7 +155,7 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 				h.description.setText(R.string.divider_descr);
 				h.icon.setVisibility(View.GONE);
 				h.actionIcon.setVisibility(View.GONE);
-				h.moveIcon.setVisibility(View.VISIBLE);
+				h.moveButton.setVisibility(View.VISIBLE);
 				h.divider.setVisibility(View.VISIBLE);
 			} else if (SHOW_CATEGORY_ID.equals(id)
 					|| MAP_RENDERING_CATEGORY_ID.equals(id)) {
@@ -165,7 +165,7 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 				h.description.setText(R.string.move_inside_category);
 				h.icon.setVisibility(View.GONE);
 				h.actionIcon.setVisibility(View.GONE);
-				h.moveIcon.setVisibility(View.GONE);
+				h.moveButton.setVisibility(View.GONE);
 				h.divider.setVisibility(View.VISIBLE);
 				h.movable = false;
 			} else {
@@ -179,7 +179,7 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 				h.title.setTextColor(app.getResources().getColor(textColorRes));
 				h.description.setText(getDescription(menuItem.getId()));
 				h.divider.setVisibility(View.GONE);
-				h.moveIcon.setVisibility(View.VISIBLE);
+				h.moveButton.setVisibility(View.VISIBLE);
 			}
 			h.actionIcon.setOnClickListener(new View.OnClickListener() {
 				@Override
@@ -190,7 +190,7 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 					}
 				}
 			});
-			h.moveIcon.setOnTouchListener(new View.OnTouchListener() {
+			h.moveButton.setOnTouchListener(new View.OnTouchListener() {
 				@Override
 				public boolean onTouch(View view, MotionEvent event) {
 					if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
@@ -202,11 +202,11 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 			if (!menuItem.isHidden()
 					&& !id.equals(SHOW_CATEGORY_ID)
 					&& !id.equals(MAP_RENDERING_CATEGORY_ID)) {
-				h.moveIcon.setVisibility(View.VISIBLE);
+				h.moveButton.setVisibility(View.VISIBLE);
 				h.moveIcon.setImageDrawable(uiUtilities.getIcon(R.drawable.ic_action_item_move, nightMode));
 				h.actionIcon.setImageDrawable(uiUtilities.getIcon(R.drawable.ic_action_remove, R.color.color_osm_edit_delete));
 			} else {
-				h.moveIcon.setVisibility(View.GONE);
+				h.moveButton.setVisibility(View.GONE);
 				h.actionIcon.setImageDrawable(uiUtilities.getIcon(R.drawable.ic_action_undo, R.color.color_osm_edit_create));
 			}
 			if (id.equals(MAP_CONTEXT_MENU_MORE_ID)) {
@@ -218,7 +218,7 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 				h.title.setText(R.string.create_edit_poi);
 			}
 			if (id.equals(MAP_CONTEXT_MENU_ADD_ID)) {
-				h.title.setText(R.string.shared_string_add_edit);
+				h.title.setText(R.string.add_edit_favorite);
 			}
 		} else if (holder instanceof HeaderHolder) {
 			HeaderHolder h = (HeaderHolder) holder;
@@ -344,6 +344,7 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 		private ImageView icon;
 		private ImageView actionIcon;
 		private ImageView moveIcon;
+		private FrameLayout moveButton;
 		private View divider;
 		private boolean movable = true;
 
@@ -354,6 +355,7 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 			actionIcon = itemView.findViewById(R.id.action_icon);
 			icon = itemView.findViewById(R.id.icon);
 			moveIcon = itemView.findViewById(R.id.move_icon);
+			moveButton = itemView.findViewById(R.id.move_button);
 			divider = itemView.findViewById(R.id.divider);
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java
index 8dda02c00f..e370d885e4 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/SelectFolderBottomSheet.java
@@ -134,6 +134,7 @@ public class SelectFolderBottomSheet extends BasePreferenceBottomSheet {
 				fragment.setDescription(description);
 				fragment.setBtnTitle(btnTitle);
 				fragment.setUsedOnMap(usedOnMap);
+				fragment.setArguments(args);
 				fragment.show(fm, TAG);
 			}
 			return true;
diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
index fa4ddec9be..d76917cf73 100644
--- a/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
+++ b/OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java
@@ -112,7 +112,7 @@ public class TerrainFragment extends BaseOsmAndFragment implements View.OnClickL
 		app = requireMyApplication();
 		settings = app.getSettings();
 		uiUtilities = app.getUIUtilities();
-		nightMode = !settings.isLightContent();
+		nightMode = app.getDaynightHelper().isNightModeForMapControls();
 		srtmPlugin = OsmandPlugin.getPlugin(SRTMPlugin.class);
 		colorProfileRes = settings.getApplicationMode().getIconColorInfo().getColor(nightMode);
 		colorProfile = ContextCompat.getColor(app, colorProfileRes);
@@ -123,8 +123,7 @@ public class TerrainFragment extends BaseOsmAndFragment implements View.OnClickL
 	@Nullable
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-		inflater = UiUtilities.getInflater(app, nightMode);
-		View root = inflater.inflate(R.layout.fragment_terrain, container, false);
+		View root = UiUtilities.getInflater(inflater.getContext(), nightMode).inflate(R.layout.fragment_terrain, container, false);
 		TextView emptyStateDescriptionTv = root.findViewById(R.id.empty_state_description);
 		TextView slopeReadMoreTv = root.findViewById(R.id.slope_read_more_tv);
 		TextView titleTv = root.findViewById(R.id.title_tv);
diff --git a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java
index 8c47ed2838..11dd094575 100644
--- a/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java
+++ b/OsmAnd/src/net/osmand/plus/transport/TransportLinesMenu.java
@@ -35,7 +35,7 @@ import java.util.Map;
 
 public class TransportLinesMenu {
 
-	public static final String TRANSPORT_RENDERING_CATEGORY = "transport";
+	public static final String RENDERING_CATEGORY_TRANSPORT = "transport";
 
 	public static final String PT_TRANSPORT_STOPS = "transportStops";
 	public static final String PT_PUBLIC_TRANSPORT_MODE = "publicTransportMode";
@@ -199,7 +199,7 @@ public class TransportLinesMenu {
 	public static List<RenderingRuleProperty> getTransportRules(OsmandApplication app) {
 		List<RenderingRuleProperty> transportRules = new ArrayList<>();
 		for (RenderingRuleProperty property : ConfigureMapMenu.getCustomRules(app)) {
-			if (TRANSPORT_RENDERING_CATEGORY.equals(property.getCategory()) && property.isBoolean()) {
+			if (RENDERING_CATEGORY_TRANSPORT.equals(property.getCategory()) && property.isBoolean()) {
 				transportRules.add(property);
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index c9e785f9eb..366da4afd5 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -20,6 +20,7 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresPermission;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.AndroidUtils;
@@ -139,7 +140,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		Context context = view.getContext();
 		contextMarker = new ImageView(context);
 		contextMarker.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-		contextMarker.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.map_pin_context_menu));
+		contextMarker.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.map_pin_context_menu));
 		contextMarker.setClickable(true);
 		int minw = contextMarker.getDrawable().getMinimumWidth();
 		int minh = contextMarker.getDrawable().getMinimumHeight();
diff --git a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
index b30ccf3c16..dbdfc9765b 100644
--- a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
@@ -21,6 +21,7 @@ import android.util.Pair;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.GPXUtilities;
@@ -178,7 +179,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 
 		paintIcon = new Paint();
 		pointSmall = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_white_shield_small);
-		selectedPoint = (LayerDrawable) view.getResources().getDrawable(R.drawable.map_location_default);
+		selectedPoint = (LayerDrawable) AppCompatResources.getDrawable(view.getContext(), R.drawable.map_location_default);
 
 		contextMenuLayer = view.getLayerByClass(ContextMenuLayer.class);
 
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index f0b0d988eb..57c75b0af9 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -25,6 +25,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
@@ -793,7 +794,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 		updateMyLocation(rh, routeDialogOpened || trackDialogOpened || contextMenuOpened);
 		boolean showButtons = (showRouteCalculationControls || !routeFollowingMode)
 				&& !isInMovingMarkerMode() && !isInGpxDetailsMode() && !isInMeasurementToolMode() && !isInPlanRouteMode() && !contextMenuOpened && !isInChoosingRoutesMode() && !isInWaypointsChoosingMode();
-		//routePlanningBtn.setIconResId(routeFollowingMode ? R.drawable.ic_action_gabout_dark : R.drawable.map_directions);
+		//routePlanningBtn.setIconResId(routeFollowingMode ? R.drawable.ic_action_info_dark : R.drawable.map_directions);
 		int routePlanningBtnImage = mapRouteInfoMenu.getRoutePlanningBtnImage();
 		if (routePlanningBtnImage != 0) {
 			routePlanningBtn.setIconResId(routePlanningBtnImage);
@@ -1148,10 +1149,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 			nightMode = night;
 			if (bgDark != 0 && bgLight != 0) {
 				if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-					iv.setBackground(ctx.getResources().getDrawable(night ? bgDark : bgLight,
-							mapActivity.getTheme()));
+					iv.setBackground(AppCompatResources.getDrawable(mapActivity, night ? bgDark : bgLight));
 				} else {
-					iv.setBackgroundDrawable(ctx.getResources().getDrawable(night ? bgDark : bgLight));
+					iv.setBackgroundDrawable(AppCompatResources.getDrawable(mapActivity, night ? bgDark : bgLight));
 				}
 			}
 			Drawable d = null;
diff --git a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
index 0c136f029d..d79ba54367 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
@@ -17,6 +17,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 
 import androidx.annotation.DimenRes;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Pair;
 import androidx.fragment.app.Fragment;
@@ -111,7 +112,7 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
         Context context = view.getContext();
         contextMarker = new ImageView(context);
         contextMarker.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT));
-        contextMarker.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.map_pin_context_menu));
+        contextMarker.setImageDrawable(AppCompatResources.getDrawable(context, R.drawable.map_pin_context_menu));
         contextMarker.setClickable(true);
         int minw = contextMarker.getDrawable().getMinimumWidth();
         int minh = contextMarker.getDrawable().getMinimumHeight();
diff --git a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
index 35d87d788b..0e006404d9 100644
--- a/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
@@ -11,6 +11,7 @@ import android.graphics.PorterDuffColorFilter;
 import android.graphics.RectF;
 import android.graphics.drawable.LayerDrawable;
 
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
@@ -172,12 +173,16 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
 			this.headingIconId = headingIconId;
 			this.navigationIconId = navigationIconId;
 			int color = ContextCompat.getColor(view.getContext(), colorId);
-			navigationIcon = (LayerDrawable) view.getResources().getDrawable(navigationIconId);
-			DrawableCompat.setTint(navigationIcon.getDrawable(1), color);
+			navigationIcon = (LayerDrawable) AppCompatResources.getDrawable(view.getContext(), navigationIconId);
+			if (navigationIcon != null) {
+				DrawableCompat.setTint(navigationIcon.getDrawable(1), color);
+			}
 			headingIcon = BitmapFactory.decodeResource(view.getResources(), headingIconId);
 			headingPaint.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
-			locationIcon = (LayerDrawable) view.getResources().getDrawable(locationIconId);
-			DrawableCompat.setTint(DrawableCompat.wrap(locationIcon.getDrawable(1)), color);
+			locationIcon = (LayerDrawable) AppCompatResources.getDrawable(view.getContext(), locationIconId);
+			if (locationIcon != null) {
+				DrawableCompat.setTint(DrawableCompat.wrap(locationIcon.getDrawable(1)), color);
+			}
 			area.setColor(UiUtilities.getColorWithAlpha(color, 0.16f));
 			aroundArea.setColor(color);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
index b1632aa5ac..c00b0e1d56 100644
--- a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
@@ -17,6 +17,7 @@ import android.util.Pair;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 
 import net.osmand.AndroidUtils;
@@ -146,7 +147,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
 		wayContext = new GeometryWayContext(view.getContext(), density);
 
 		paintIconSelected = new Paint();
-		selectedPoint = (LayerDrawable) view.getResources().getDrawable(R.drawable.map_location_default);
+		selectedPoint = (LayerDrawable) AppCompatResources.getDrawable(view.getContext(), R.drawable.map_location_default);
 
 		paintGridCircle = new Paint();
 		paintGridCircle.setStyle(Paint.Style.FILL_AND_STROKE);
@@ -323,7 +324,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
 	private void drawProjectionPoint(Canvas canvas, double[] projectionXY) {
 		if (projectionIcon == null) {
 			helper.getSettings().getApplicationMode().getLocationIcon();
-			projectionIcon = (LayerDrawable) view.getResources().getDrawable(LocationIcon.DEFAULT.getIconId());
+			projectionIcon = (LayerDrawable) AppCompatResources.getDrawable(view.getContext(), LocationIcon.DEFAULT.getIconId());
 		}
 		int locationX = (int) projectionXY[0];
 		int locationY = (int) projectionXY[1];
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 2b997cf25b..52ca3c70b9 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -27,6 +27,7 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
@@ -1131,19 +1132,27 @@ public class MapInfoWidgetsFactory {
 		}
 
 		private boolean setRoadShield(ImageView view, RouteDataObject object) {
-			String nameTag = null;
-			String name = null;
 			StringBuilder additional = new StringBuilder();
 			for (int i = 0; i < object.nameIds.length; i++) {
 				String key = object.region.routeEncodingRules.get(object.nameIds[i]).getTag();
 				String val = object.names.get(object.nameIds[i]);
-				if (key.startsWith("road_ref")) {
-					nameTag = key;
-					name = val;
-				} else {
+				if (!key.startsWith("road_ref")) {
 					additional.append(key).append("=").append(val).append(";");
 				}
 			}
+			for (int i = 0; i < object.nameIds.length; i++) {
+				String key = object.region.routeEncodingRules.get(object.nameIds[i]).getTag();
+				String val = object.names.get(object.nameIds[i]);
+				if (key.startsWith("road_ref")) {
+					boolean visible = setRoadShield(view, object, key, val, additional);
+					if(visible) {
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+		private boolean setRoadShield(ImageView view, RouteDataObject object, String nameTag, String name, StringBuilder additional ) {
 
 			Context context = topBar.getContext();
 			int[] tps = object.getTypes();
@@ -1196,7 +1205,7 @@ public class MapInfoWidgetsFactory {
 			}
 
 			if (shieldRes != -1) {
-				Drawable shield = ContextCompat.getDrawable(view.getContext(), shieldRes);
+				Drawable shield = AppCompatResources.getDrawable(view.getContext(), shieldRes);
 				if (shield == null) {
 					return false;
 				}
diff --git a/OsmAnd/src/net/osmand/plus/widgets/style/CustomTypefaceSpan.java b/OsmAnd/src/net/osmand/plus/widgets/style/CustomTypefaceSpan.java
index b679a320eb..a06c7a30da 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/style/CustomTypefaceSpan.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/style/CustomTypefaceSpan.java
@@ -24,8 +24,7 @@ public class CustomTypefaceSpan extends MetricAffectingSpan {
 
 	private void update(TextPaint tp) {
 		Typeface old = tp.getTypeface();
-		int oldStyle = old.getStyle();
-		Typeface font = Typeface.create(typeface, oldStyle);
+		Typeface font = Typeface.create(typeface, old != null ? old.getStyle() : Typeface.NORMAL);
 		tp.setTypeface(font);
 	}
 }
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
index 4a822cf8c0..6039ae7205 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java
@@ -12,6 +12,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
@@ -56,7 +57,7 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 
 		items.add(new TitleItem(getString(R.string.shared_string_contents)));
 
-		Drawable transparent = ContextCompat.getDrawable(ctx, R.color.color_transparent);
+		Drawable transparent = AppCompatResources.getDrawable(ctx, R.color.color_transparent);
 		expListView = new ExpandableListView(ctx);
 		expListView.setAdapter(new ExpandableListAdapter(ctx, contentItem));
 		expListView.setDivider(transparent);
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java
index 99314a56f2..886e128d04 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java
@@ -15,6 +15,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -86,7 +87,7 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
 		final ExpandableListAdapter listAdapter = new ExpandableListAdapter(ctx, navigationMap);
 
 		expListView.setAdapter(listAdapter);
-		Drawable transparent = ContextCompat.getDrawable(ctx, R.color.color_transparent);
+		Drawable transparent = AppCompatResources.getDrawable(ctx, R.color.color_transparent);
 		expListView.setDivider(transparent);
 		expListView.setGroupIndicator(transparent);
 		expListView.setSelector(transparent);
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
index d466ffb7dc..eedfddad0d 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -118,7 +119,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
 
 	private Drawable getIcon() {
 		int id = download ? R.drawable.travel_card_download_icon : R.drawable.travel_card_update_icon;
-		return ContextCompat.getDrawable(app, id);
+		return AppCompatResources.getDrawable(app, id);
 	}
 
 	@NonNull
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java b/OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java
index b86bb6794e..902b883e3d 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -134,7 +135,7 @@ public class SearchRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView
 	}
 
 	private LayerDrawable getPlaceholder(boolean history) {
-		LayerDrawable res = (LayerDrawable) ContextCompat.getDrawable(
+		LayerDrawable res = (LayerDrawable) AppCompatResources.getDrawable(
 				app, history
 						? R.drawable.wikivoyage_search_history_placeholder
 						: R.drawable.wikivoyage_search_placeholder
diff --git a/OsmAndCore-sample/src/net/osmand/AndroidUtils.java b/OsmAndCore-sample/src/net/osmand/AndroidUtils.java
index 1e4e6afa06..6fc32a3881 100644
--- a/OsmAndCore-sample/src/net/osmand/AndroidUtils.java
+++ b/OsmAndCore-sample/src/net/osmand/AndroidUtils.java
@@ -18,6 +18,8 @@ import android.view.ViewParent;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 
+import androidx.appcompat.content.res.AppCompatResources;
+
 import net.osmand.core.samples.android.sample1.R;
 
 import java.io.BufferedReader;
@@ -103,10 +105,9 @@ public class AndroidUtils {
 	@SuppressWarnings("deprecation")
 	public static void setBackground(Context ctx, View view, boolean night, int lightResId, int darkResId) {
 		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-			view.setBackground(ctx.getResources().getDrawable(night ? darkResId : lightResId,
-					ctx.getTheme()));
+			view.setBackground(AppCompatResources.getDrawable(ctx, night ? darkResId : lightResId));
 		} else {
-			view.setBackgroundDrawable(ctx.getResources().getDrawable(night ? darkResId : lightResId));
+			view.setBackgroundDrawable(AppCompatResources.getDrawable(ctx, night ? darkResId : lightResId));
 		}
 	}
 
diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/data/PointDescription.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/data/PointDescription.java
index 5ef7a17d77..aa568664ea 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/data/PointDescription.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/data/PointDescription.java
@@ -359,15 +359,15 @@ public class PointDescription {
 	public int getIconId() {
 		int iconId;
 		if (isAddress()) {
-			iconId = OsmandResources.getDrawableId("ic_type_address");
+			iconId = OsmandResources.getDrawableId("ic_action_street_name");
 		} else if (isFavorite()) {
-			iconId = OsmandResources.getDrawableId("ic_type_favorites");
+			iconId = OsmandResources.getDrawableId("ic_action_favorite");
 		} else if (isLocation()) {
-			iconId = OsmandResources.getDrawableId("ic_type_coordinates");
+			iconId = OsmandResources.getDrawableId("ic_action_marker_dark");
 		} else if (isPoi()) {
-			iconId = OsmandResources.getDrawableId("ic_type_info");
+			iconId = OsmandResources.getDrawableId("ic_action_info_dark");
 		} else if (isWpt()) {
-			iconId = OsmandResources.getDrawableId("ic_type_waypoint");
+			iconId = OsmandResources.getDrawableId("ic_action_flag_stroke");
 		} else if (isAudioNote()) {
 			iconId = OsmandResources.getDrawableId("ic_type_audio");
 		} else if (isVideoNote()) {
@@ -375,7 +375,7 @@ public class PointDescription {
 		}else if (isPhotoNote()) {
 			iconId = OsmandResources.getDrawableId("ic_type_img");
 		}  else {
-			iconId = OsmandResources.getDrawableId("ic_type_address");
+			iconId = OsmandResources.getDrawableId("ic_action_street_name");
 		}
 		return iconId;
 	}
diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/controllers/PointDescriptionMenuController.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/controllers/PointDescriptionMenuController.java
index 85df53de8c..eca55b02ef 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/controllers/PointDescriptionMenuController.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/controllers/PointDescriptionMenuController.java
@@ -51,7 +51,7 @@ public class PointDescriptionMenuController extends MenuController {
 	@Override
 	public Drawable getSecondLineTypeIcon() {
 		if (hasTypeInDescription) {
-			return getIcon(OsmandResources.getDrawableId("ic_small_group"));
+			return getIcon(OsmandResources.getDrawableId("ic_action_group_name_16"));
 		} else {
 			return null;
 		}
diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListAdapter.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListAdapter.java
index 9d3137c84d..6b1cf39ab0 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListAdapter.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/search/QuickSearchListAdapter.java
@@ -209,7 +209,7 @@ public class QuickSearchListAdapter extends ArrayAdapter<QuickSearchListItem> {
 
 					timeIcon.setVisibility(View.VISIBLE);
 					timeText.setVisibility(View.VISIBLE);
-					timeIcon.setImageDrawable(app.getIconsCache().getIcon("ic_small_time", colorId));
+					timeIcon.setImageDrawable(app.getIconsCache().getIcon("ic_action_time_16", colorId));
 					timeText.setTextColor(app.getResources().getColor(colorId));
 					String rt = rs.getCurrentRuleTime(inst);
 					timeText.setText(rt == null ? "" : rt);