[fdroid] Release version 2025.08.31-15

Signed-off-by: Harry Bond <me@hbond.xyz>
2026-01-09 13:54:37 +00:00 · 2025-08-31 22:47:29 +01:00
78 changed files with 222 additions and 393 deletions
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -6,7 +6,7 @@ on:
      - main

 env:
-  JAVA_HOME: /usr/lib/jvm/temurin-21-jdk-amd64  # Java 21 is required for Android Gradle 8 plugin
+  JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64  # Java 17 is required for Android Gradle 8 plugin
  SKIP_MAP_DOWNLOAD: true

 jobs:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_T
  add_compile_options(-fno-fat-lto-objects)
  # To fix ar and ranlib "plugin needed to handle lto object".
  string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
-  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}*/liblto_plugin.so)
+  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
  set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
  set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
  set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -29,12 +29,12 @@ def getCommitMessage() {
 project.ext.appId = 'app.comaps'
 project.ext.appName = 'CoMaps'

-
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(21))
-  }
-}
+// I have Java 21 installed, but this doesn't work on MacOS.
+//java {
+//  toolchain {
+//    languageVersion.set(JavaLanguageVersion.of(17))
+//  }
+//}

 android {
  namespace = 'app.organicmaps'
@@ -311,8 +311,8 @@ android {
  compileOptions {
    coreLibraryDesugaringEnabled = true

-    sourceCompatibility JavaVersion.VERSION_21
-    targetCompatibility JavaVersion.VERSION_21
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
  }
 }

--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.08.31-15-FDroid+25083115
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
@@ -9,6 +9,7 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import androidx.annotation.NonNull;
@@ -26,7 +27,6 @@ import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-import com.google.android.material.button.MaterialButton;
 import com.google.android.material.divider.MaterialDividerItemDecoration;
 import java.util.ArrayList;

@@ -42,10 +42,10 @@ public class ManageRouteBottomSheet
  {
    View v = inflater.inflate(R.layout.manage_route_bottom_sheet, container, false);

-    MaterialButton cancelButton = v.findViewById(R.id.btn__cancel);
+    Button cancelButton = v.findViewById(R.id.btn__cancel);
    cancelButton.setOnClickListener(this);

-    MaterialButton planButton = v.findViewById(R.id.btn__plan);
+    Button planButton = v.findViewById(R.id.btn__plan);
    planButton.setOnClickListener(this);

    mMyLocationImageView = v.findViewById(R.id.image_my_location);
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -68,7 +68,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
  @NonNull
  private final MaterialTextView mError;
  @NonNull
-  private final MaterialButton mStart;
+  private final Button mStart;
  @NonNull
  private final ImageView mAltitudeChart;
  @NonNull
@@ -101,7 +101,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
    View timeElevationLine = getViewById(activity, frame, R.id.time_elevation_line);
    View transitFrame = getViewById(activity, frame, R.id.transit_panel);
    MaterialTextView error = (MaterialTextView) getViewById(activity, frame, R.id.error);
-    MaterialButton start = (MaterialButton) getViewById(activity, frame, R.id.start);
+    Button start = (Button) getViewById(activity, frame, R.id.start);
    ImageView altitudeChart = (ImageView) getViewById(activity, frame, R.id.altitude_chart);
    MaterialTextView time = (MaterialTextView) getViewById(activity, frame, R.id.time);
    TextView timeVehicle = (TextView) getViewById(activity, frame, R.id.time_vehicle);
@@ -123,7 +123,7 @@ final class RoutingBottomMenuController implements View.OnClickListener

  private RoutingBottomMenuController(@NonNull Activity context, @NonNull View altitudeChartFrame,
                                      @NonNull View timeElevationLine, @NonNull View transitFrame,
-                                      @NonNull MaterialTextView error, @NonNull MaterialButton start,
+                                      @NonNull MaterialTextView error, @NonNull Button start,
                                      @NonNull ImageView altitudeChart, @NonNull MaterialTextView time,
                                      @NonNull MaterialTextView altitudeDifference, @NonNull TextView timeVehicle,
                                      @Nullable MaterialTextView arrival, @NonNull View actionFrame,
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -166,7 +166,7 @@
        android:orientation="horizontal">
        <com.google.android.material.button.MaterialButton
          android:id="@+id/donate"
-          style="@style/MwmWidget.M3.Button.Primary"
+          style="@style/MwmWidget.Button.Accent"
          android:layout_width="0dp"
          android:layout_height="wrap_content"
          android:padding="@dimen/margin_quarter"
@@ -182,9 +182,10 @@
          app:layout_constraintVertical_bias="0.5" />
        <com.google.android.material.button.MaterialButton
          android:id="@+id/report"
-          style="@style/MwmWidget.M3.Button"
+          style="@style/MwmWidget.Button"
          android:layout_width="0dp"
          android:layout_height="wrap_content"
+          android:background="@color/light_gray"
          android:text="@string/report_a_bug"
          android:textAlignment="center"
          android:textColor="@color/text_dark"
@@ -194,8 +195,7 @@
          app:layout_constraintHorizontal_bias="0.5"
          app:layout_constraintStart_toEndOf="@+id/donate"
          app:layout_constraintTop_toTopOf="parent"
-          app:layout_constraintVertical_bias="0.5"
-          app:backgroundTint="@color/light_gray"/>
+          app:layout_constraintVertical_bias="0.5" />
      </androidx.constraintlayout.widget.ConstraintLayout>

      <com.google.android.material.textview.MaterialTextView
--- a/android/app/src/main/res/layout-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
@@ -69,10 +69,9 @@
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_marginStart="6dp"
-      style="@style/Widget.Material3.Button.TextButton"
+      style="@style/MwmWidget.Button"
      android:text="@string/planning_route_manage_route"
      android:textColor="?android:textColorPrimary"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
      app:icon="@drawable/ic_manage_route"
      app:iconTint="?android:textColorPrimary"
      app:iconPadding="6dp"/>
@@ -85,14 +84,13 @@
        android:layout_gravity="center_vertical"
        android:layout_marginStart="@dimen/margin_base"
        android:minHeight="@dimen/primary_button_min_height"
-        style="@style/Widget.Material3.Button.TextButton"
+        style="@style/MwmWidget.Button"
        android:text="@string/save"
-        android:textColor="?android:textColorPrimary"
-        android:textAppearance="@style/MwmTextAppearance.Body1"/>
+        android:textColor="?android:textColorPrimary"/>

-    <com.google.android.material.button.MaterialButton
+    <Button
      android:id="@+id/start"
-      style="@style/MwmWidget.M3.Button.Primary"
+      style="@style/MwmWidget.Button.Primary"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_weight="0"
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -110,10 +110,11 @@
            android:layout_marginBottom="@dimen/margin_base">
            <com.google.android.material.button.MaterialButton
              android:id="@+id/login"
-              style="@style/MwmWidget.M3.Button.Primary"
+              style="@style/MwmWidget.Button.Accent"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
-              android:text="@string/login_osm" />
+              android:text="@string/login_osm"
+              android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
            <ProgressBar
              android:id="@+id/osm_login_progress"
              android:layout_width="@dimen/editor_auth_btn_height"
@@ -146,14 +147,15 @@
            android:textColor="?android:textColorPrimary" />
          <com.google.android.material.button.MaterialButton
            android:id="@+id/register"
-            style="@style/MwmWidget.M3.Button"
+            style="@style/MwmWidget.Button.Accent"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/margin_base"
+            android:background="@drawable/button_editor_light"
            android:padding="@dimen/margin_quarter"
            android:text="@string/register_at_openstreetmap"
-            android:textColor="@color/text_dark"
-            app:backgroundTint="@color/bg_editor_light"/>
+            android:textAppearance="@style/MwmTextAppearance.Body2"
+            android:textColor="@color/text_dark" />
        </LinearLayout>
      </LinearLayout>
    </LinearLayout>
--- a/android/app/src/main/res/layout-land/onmap_downloader.xml
+++ b/android/app/src/main/res/layout-land/onmap_downloader.xml
@@ -60,7 +60,7 @@
        android:clipChildren="false">
        <com.google.android.material.button.MaterialButton
          android:id="@+id/downloader_button"
-          style="@style/MwmWidget.M3.Button.Primary"
+          style="@style/MwmWidget.Button.Primary"
          android:layout_width="180dp"
          android:layout_gravity="center"
          android:visibility="gone"
--- a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
@@ -88,10 +88,9 @@
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_marginStart="6dp"
-      style="@style/Widget.Material3.Button.TextButton"
+      style="@style/MwmWidget.Button"
      android:text="@string/planning_route_manage_route"
      android:textColor="?android:textColorPrimary"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
      app:icon="@drawable/ic_manage_route"
      app:iconTint="?android:textColorPrimary"
      app:iconPadding="6dp"/>
@@ -101,15 +100,14 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/margin_base"
-        style="@style/Widget.Material3.Button.TextButton"
+        style="@style/MwmWidget.Button"
        android:minHeight="@dimen/primary_button_min_height"
        android:text="@string/save"
-        android:textColor="?android:textColorPrimary"
-        android:textAppearance="@style/MwmTextAppearance.Body1"/>
+        android:textColor="?android:textColorPrimary"/>

-    <com.google.android.material.button.MaterialButton
+    <Button
      android:id="@+id/start"
-      style="@style/MwmWidget.M3.Button.Primary"
+      style="@style/MwmWidget.Button.Primary"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_weight="0"
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -112,7 +112,7 @@

    <com.google.android.material.button.MaterialButton
        android:id="@+id/donate"
-        style="@style/MwmWidget.M3.Button.Primary"
+        style="@style/MwmWidget.Button.Accent"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/margin_base"
@@ -121,13 +121,13 @@

    <com.google.android.material.button.MaterialButton
        android:id="@+id/report"
-        style="@style/MwmWidget.M3.Button"
+        style="@style/MwmWidget.Button"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_half"
+        android:layout_marginTop="@dimen/margin_base"
+        android:background="@color/light_gray"
        android:text="@string/report_a_bug"
-        android:textColor="@color/text_dark"
-        app:backgroundTint="@color/light_gray"/>
+        android:textColor="@color/text_dark" />

    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/faq"
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/android/app/src/main/res/layout/activity_map_placeholder.xml
@@ -41,7 +41,7 @@

  <com.google.android.material.button.MaterialButton
      android:id="@+id/btn_continue"
-      style="@style/MwmWidget.M3.Button.Primary"
+      style="@style/MwmWidget.Button.Accent"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:layout_marginEnd="32dp"
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/android/app/src/main/res/layout/activity_request_permissions.xml
@@ -25,7 +25,7 @@

  <com.google.android.material.button.MaterialButton
      android:id="@+id/btn_grant_permissions"
-      style="@style/MwmWidget.M3.Button.Primary"
+      style="@style/MwmWidget.Button.Accent"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:layout_marginEnd="32dp"
--- a/android/app/src/main/res/layout/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout/altitude_chart_panel.xml
@@ -71,9 +71,9 @@
              tools:visibility="visible" />
        </LinearLayout>

-        <com.google.android.material.button.MaterialButton
+        <Button
          android:id="@+id/start"
-          style="@style/MwmWidget.M3.Button.Primary"
+          style="@style/MwmWidget.Button.Primary"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:layout_weight="0"
@@ -94,11 +94,10 @@
          android:id="@+id/btn__manage_route"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
-          style="@style/Widget.Material3.Button.TextButton"
+          style="@style/MwmWidget.Button"
          android:text="@string/planning_route_manage_route"
          android:textColor="?android:textColorPrimary"
          android:textAlignment="viewStart"
-          android:textAppearance="@style/MwmTextAppearance.Body1"
          app:icon="@drawable/ic_manage_route"
          app:iconTint="?android:textColorPrimary"
          app:iconPadding="@dimen/margin_quarter_plus"/>
@@ -108,12 +107,11 @@
          android:id="@+id/btn__save"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
-          style="@style/Widget.Material3.Button.TextButton"
+          style="@style/MwmWidget.Button"
          android:layout_marginStart="@dimen/margin_base"
          android:minHeight="@dimen/primary_button_min_height"
          android:text="@string/save"
-          android:textColor="?android:textColorPrimary"
-          android:textAppearance="@style/MwmTextAppearance.Body1"/>
+          android:textColor="?android:textColorPrimary"/>
    </LinearLayout>

 </LinearLayout>
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -31,7 +31,7 @@
    app:trackColor="@color/bg_routing_progress"/>
  <com.google.android.material.button.MaterialButton
    android:id="@+id/btn_download_resources"
-    style="@style/MwmWidget.M3.Button.Primary"
+    style="@style/MwmWidget.Button.Primary"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginStart="@dimen/margin_base_plus"
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -94,10 +94,11 @@
        android:layout_marginBottom="@dimen/margin_base">
        <com.google.android.material.button.MaterialButton
          android:id="@+id/login"
-          style="@style/MwmWidget.M3.Button.Primary"
+          style="@style/MwmWidget.Button.Accent"
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
-          android:text="@string/login_osm" />
+          android:text="@string/login_osm"
+          android:textAppearance="@style/MwmTextAppearance.Body2.Light" />
        <ProgressBar
          android:id="@+id/osm_login_progress"
          android:layout_width="@dimen/editor_auth_btn_height"
@@ -108,16 +109,14 @@
      </FrameLayout>
      <com.google.android.material.button.MaterialButton
        android:id="@+id/lost_password"
-        style="@style/MwmWidget.M3.Button"
+        style="@style/MwmWidget.Button"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end"
        android:background="?clickableBackground"
        android:padding="@dimen/margin_half"
        android:text="@string/forgot_password"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:textColor="@color/text_dark"
-          tools:visibility="invisible"/>
+        android:textAppearance="@style/MwmTextAppearance.Body3" />
      <com.google.android.material.divider.MaterialDivider
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@@ -131,14 +130,15 @@
        android:textColor="?android:textColorPrimary" />
      <com.google.android.material.button.MaterialButton
        android:id="@+id/register"
-        style="@style/MwmWidget.M3.Button"
+        style="@style/MwmWidget.Button.Accent"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/margin_base"
+        android:background="@drawable/button_editor_light"
        android:padding="@dimen/margin_quarter"
        android:text="@string/register_at_openstreetmap"
-        android:textColor="@color/text_dark"
-        app:backgroundTint="@color/bg_editor_light"/>
+        android:textAppearance="@style/MwmTextAppearance.Body2"
+        android:textColor="@color/text_dark" />
    </LinearLayout>
  </ScrollView>
 </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_suggest_country_download.xml
+++ b/android/app/src/main/res/layout/fragment_suggest_country_download.xml
@@ -60,7 +60,7 @@

      <com.google.android.material.button.MaterialButton
        android:id="@+id/btn__download_map"
-        style="@style/MwmWidget.M3.Button.Primary"
+        style="@style/MwmWidget.Button.Primary"
        android:layout_marginTop="@dimen/margin_half"
        android:text="@string/downloader_download_map"/>
    </LinearLayout>
@@ -85,7 +85,7 @@

      <com.google.android.material.button.MaterialButton
        android:id="@+id/btn__select_map"
-        style="@style/MwmWidget.M3.Button.Primary"
+        style="@style/MwmWidget.Button.Primary"
        android:layout_marginTop="@dimen/margin_half"
        android:text="@string/search_select_map"/>
    </LinearLayout>
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -45,15 +45,13 @@
      android:maxLines="6" />
  </com.google.android.material.textfield.TextInputLayout>
  
-  <com.google.android.material.button.MaterialButton
+  <Button
    android:id="@+id/send_note_button"
-    style="@style/MwmWidget.M3.Button.Primary"
+    style="@style/MwmWidget.Button.Accent"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_gravity="center_horizontal"
-    android:background="?accentButtonBackground"
    android:layout_marginTop="@dimen/margin_base"
-    android:enabled="true"
-    android:text="@string/editor_report_problem_send_button"
-    app:backgroundTint="@null"/>
+    android:enabled="false"
+    android:text="@string/editor_report_problem_send_button" />
 </LinearLayout>
--- a/android/app/src/main/res/layout/item_timetable_add.xml
+++ b/android/app/src/main/res/layout/item_timetable_add.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:paddingBottom="@dimen/margin_base_plus"
@@ -9,12 +8,10 @@

  <com.google.android.material.button.MaterialButton
    android:id="@+id/btn__add_time"
-    style="@style/MwmWidget.M3.Button.Primary"
+    style="@style/MwmWidget.Button.Primary"
    android:layout_gravity="center"
    android:enabled="false"
-    android:background="?accentButtonBackground"
    android:padding="@dimen/margin_base"
-    android:text="@string/editor_time_add"
-    app:backgroundTint="@null"/>
+    android:text="@string/editor_time_add"/>

 </FrameLayout>
--- a/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
+++ b/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
@@ -89,22 +89,21 @@
    android:paddingStart="0dp"
    android:paddingEnd="@dimen/altitude_chart_container_padding_left">

-    <com.google.android.material.button.MaterialButton
+    <Button
      android:id="@+id/btn__cancel"
-      style="@style/Widget.Material3.Button.TextButton"
+      style="@style/MwmWidget.Button"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_gravity="center_vertical"
      android:text="@string/cancel"
-      android:textColor="?android:textColorPrimary"
-      android:textAppearance="@style/MwmTextAppearance.Body1"
+      android:textColor="?android:attr/textColorPrimary"
      app:layout_constraintBottom_toBottomOf="parent"
      app:layout_constraintStart_toStartOf="parent"
      app:layout_constraintTop_toTopOf="parent" />

-    <com.google.android.material.button.MaterialButton
+    <Button
      android:id="@+id/btn__plan"
-      style="@style/MwmWidget.M3.Button.Primary"
+      style="@style/MwmWidget.Button.Primary"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_gravity="center_vertical"
--- a/android/app/src/main/res/layout/onmap_downloader.xml
+++ b/android/app/src/main/res/layout/onmap_downloader.xml
@@ -53,7 +53,7 @@
      android:clipChildren="false">
      <com.google.android.material.button.MaterialButton
        android:id="@+id/downloader_button"
-        style="@style/MwmWidget.M3.Button.Primary"
+        style="@style/MwmWidget.Button.Primary"
        android:layout_width="180dp"
        android:layout_gravity="center"
        android:visibility="gone"
--- a/android/app/src/main/res/layout/start_button.xml
+++ b/android/app/src/main/res/layout/start_button.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.button.MaterialButton
+<Button
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
  android:id="@+id/start"
-  style="@style/MwmWidget.M3.Button.Primary"
+  style="@style/MwmWidget.Button.Primary"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:minWidth="@dimen/start_button_width"
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -390,18 +390,4 @@
  <style name="MwmWidget.SwitchPreferenceCompat" parent="Preference.SwitchPreferenceCompat.Material">
    <item name="android:widgetLayout">@layout/preference_switch</item>
  </style>
-
-  <style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:textColor">?accentButtonTextColor</item>
-    <item name="backgroundTint">@null</item>
-    <item name="android:textAllCaps">false</item>
-    <item name="cornerRadius">20dp</item>
-    <item name="android:textSize">16sp</item>
-  </style>
-
-  <style name="MwmWidget.M3.Button.Primary" parent="@style/MwmWidget.M3.Button">
-    <item name="backgroundTint">?colorSecondary</item>
-  </style>
 </resources>
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -144,7 +144,7 @@ project.afterEvaluate {

  final taskName = gradle.startParameter.taskNames

-  if (['assemble', 'bundle', 'compile', 'install', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install'].any{taskName.any{task->task.startsWith(it)}}) {
    exec {
      workingDir '../..'

--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -68,9 +68,6 @@
    <string name="type.amenity.music_school">Music School</string>
    <string name="type.amenity.language_school">Language School</string>
    <string name="type.office.diplomatic">Embassy</string>
-    <string name="type.office.security">Security Guards Office</string>
-    <string name="type.building.guardhouse">Security Booth</string>
-    <string name="type.power.portal">Power Portal</string>
    <string name="type.amenity.fast_food">Fast Food</string>
    <string name="type.amenity.ferry_terminal">Ferry</string>
    <string name="type.amenity.fire_station">Fire Station</string>
--- a/configure.sh
+++ b/configure.sh
@@ -5,9 +5,9 @@

 echo "Configuring the repository for development..."

-SKIP_MAP_DOWNLOAD="${SKIP_MAP_DOWNLOAD:-}"
-SKIP_GENERATE_SYMBOLS="${SKIP_GENERATE_SYMBOLS:-}"
-SKIP_GENERATE_DRULES="${SKIP_GENERATE_DRULES:-}"
+SKIP_MAP_DOWNLOAD=$SKIP_MAP_DOWNLOAD
+SKIP_GENERATE_SYMBOLS=$SKIP_GENERATE_SYMBOLS
+SKIP_GENERATE_DRULES=$SKIP_GENERATE_DRULES

 DRULES_NOT_GENERATED=
 SYMBOLS_NOT_GENERATED=
@@ -68,10 +68,10 @@ Diff() {
  fi
 }

-
-echo "Checking submodules..."
-git submodule update --init --recursive --depth 1
-
+if [ ! -d 3party/boost/tools ]; then
+  echo "Cloning all submodules..."
+  git submodule update --init --recursive --depth 1
+fi
 if [ ! -d 3party/boost/boost ]; then
  echo "Bootstrapping the boost C++ library..."
  pushd 3party/boost/
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -1074,7 +1074,7 @@ ja:ガスステーション|ガス|燃料|軽油|給油
 lv:3DUS
 mr:पेट्रोल|इंधन|डिझेल|पेट्रोल पंप|पंप
 nb:3Bensinstasjon
-pl:3Stacja paliw|Stacja benzynowa
+pl:3Stacja paliw
 pt:3Posto de combustível|3Bomba de combustível|3gasolina|3gasóleo
 pt-BR:3Posto de combustível|3gasolina
 ro:3Benzinărie
@@ -1444,7 +1444,7 @@ ko:휴대폰 대리점|핸드폰|전자제품 상점|전자제품
 lv:Mobilie tālruņi|Telefoni|Viedtālruņi|Elektronikas veikali
 mr:मोबाईल|मोबाईलचे दुकान|स्मार्टफोन|इलेट्रॉनिक
 nb:4Mobiltelefonbutikk|elektronikkbutikk
-pl:Sklep z telefonami komórkowymi|smartfony|telefony komórkowe
+pl:Sklep z elektroniką|sklep elektroniczny
 pt:Loja de telemóveis|Telemóveis|loja de aparelhos eletrónicos
 pt-BR:Loja de celulares|celulares|telefone
 ro:Magazin de telefoane mobile|magazin de electronice
@@ -1485,7 +1485,7 @@ ko:꽃|꽃집|꽃가게|플로리스트
 lv:Florists|floristika|U+1F337|U+1F338|U+1F339|U+1F33A|U+1F33B|U+1F33C|U+1F490|U+1F33E|ziedi|dāvanas
 mr:फुलवला|पुष्पविक्रेता|फुलवाला
 nb:Blomsterhandler
-pl:Kwiaciarnia|kwiaty|wiązanki|towary
+pl:Kwiaciarnia|towary
 pt:4Florista
 pt-BR:4Florista|Floricultura|flores
 ro:4Florărie
@@ -1687,7 +1687,7 @@ lv:Grāmatnīca|3grāmatas|U+1F4D6|U+1F4DA|U+1F4D9|U+1F4D8|U+1F4D7|U+1F4D5
 mr:ग्रंथ विक्रेता|पुस्तक विक्रेता|पुस्तकाचे दुकान
 nb:Bokhandel
 nl:Boeken|Boekenwinkel|boekwinkel|boekhandel
-pl:Księgarnia|książki|towary
+pl:Księgarnia|towary
 pt:4Livraria
 pt-BR:4Livraria
 ro:4Librărie
@@ -2012,7 +2012,7 @@ ko:미용실|미용원|미장실|미장원|헤어샵|헤어살롱
 lv:Skaistumkopšanas salons|frizētava|U+1F484
 mr:शृंगार|मेकअप|सौन्दर्य|ब्युटी|सौंदर्य प्रसाधनगृह
 nb:Skjønnhetssalong
-pl:Salon piękności|paznokcie|Salon kosmetyczny
+pl:Salon piękności
 pt:Salão de beleza|cabeleireiro|cabeleireira|brabeiro
 pt-BR:Salão de beleza
 ro:Salon de înfrumusețare
@@ -2175,7 +2175,7 @@ lv:Tirdzniecības centrs
 mr:मॉल
 nb:Kjøpesenter
 nl:Winkelcentrum
-pl:Centrum handlowe|Galeria handlowa
+pl:Centrum handlowe
 pt:Centro comercia|3Shopping
 pt-BR:Shopping center
 ro:Mall
@@ -2499,7 +2499,7 @@ lv:Valūtas maiņa
 mr:पैसे हस्तांतरण
 nb:Pengeoverføring
 nl:Overschrijving
-pl:Transfer pieniędzy|przelewy
+pl:Transfer pieniędzy
 pt:Transferência de dinheiro
 pt-BR:Transferência de dinheiro
 ro:Transfer de bani
@@ -2566,7 +2566,6 @@ et:Haagiselamute müük
 fr:Concessionnaire de caravanes et camping-cars
 hi:4कैंपर डीलर
 lv:5kemperu veikals|5treileru veikals
-pl:Sklep z kamperami|przyczepy kempingowe
 ru:Автодом|Продажа автодомов
 tr:Karavan galerisi|Karavan Bayiliği
 uk:Продаж автобудинків
@@ -2793,7 +2792,7 @@ ko:버스 터미널|버스 정류장|버스
 lv:Autoosta|autobusi|autobuss|U+1F68C|U+1F68F|U+1F68D
 mr:बस स्थानक
 nb:3Busstasjon
-pl:2Stacja autobusowa|3Dworzec autobusowy|Zajezdnia
+pl:2Stacja autobusowa|Zajezdnia
 pt:2Estação rodoviária|2autocarros|2rodoviária
 pt-BR:2Rodoviária|estação BRT
 ro:3Gara de autobuz
@@ -2833,7 +2832,7 @@ ko:1기차역|철도역
 lv:Vilcienu stacija|stacija|vilcieni|U+1F684|U+1F685|U+1F689|U+1F682|U+1F686|U+1F688|U+1F68A|U+1F68B
 mr:रेल्वे स्थानक|रेल्वे स्टेशन
 nb:Togstasjon
-pl:3Dworzec kolejowy|3stacja kolejowa|pociąg|kolej
+pl:Dworzec kolejowy|stacja kolejowa|pociąg|kolej
 pt:Estação de comboios|2caminhos-de-ferro|2Comboios|2Apeadeiro
 pt-BR:Estação de trem|ferrovia|Ponto de parada
 ro:Feroviar|Gară
@@ -2954,7 +2953,7 @@ ko:페리|페리 터미널
 lv:Prāmis|terminālis|U+1F6A2|U+1F6A4|U+2693
 mr:तर|तरी|नाव|बोट|फेरी
 nb:3Ferje|terminal
-pl:2Prom|8Terminal promowy
+pl:2Prom
 pt:2Terminal de ferry|2Balsa|2Ferry
 pt-BR:2Estação de barcas|balsa
 ro:3Feribot|terminal
@@ -4552,7 +4551,7 @@ lv:Kuģis|laiva
 mr:जहाज
 nb:Skip|båt
 nl:Schip|boot
-pl:Łódź|okręt|statek
+pl:Łódź|okręt
 pt:2Barco|2Navio
 ro:Navă
 ru:Корабль|судно|лодка
@@ -4872,7 +4871,6 @@ ja:ドッグラン

 leisure-dance|@category_entertainment
 en:4Dance|Dancing school
-pl:Taniec|Szkoła tańca

 leisure-garden
 en:3Garden
@@ -4915,7 +4913,6 @@ fa:باغ تفریحی|گردشگری

 leisure-firepit
 en:5Firepit
-pl:Palenisko|miejsce na ognisko

 amenity-bench
 en:Bench
@@ -5015,7 +5012,6 @@ ja:自転車修理
 ko:자전거 수리
 lv:Veloremonta stacija|Veloremonta punkts|divriteņu remonts|velosipēdu remonts|veloremonts
 nl:4Fiets reparatie
-pl:Stacja naprawy rowerów
 pt:Conserto de bicicleta|4bicicleta
 pt-BR:Oficina de bicicletas|4bicicleta
 ru:4Велоремонт|велосипед|ремонт|ремонт велосипедов
@@ -5930,7 +5926,7 @@ lv:Medicīniskā laboratorija|laboratorija
 mr:वैद्यकीय प्रयोगशाळा
 nb:Medisinsk laboratorium
 nl:Medisch laboratorium
-pl:Laboratorium medyczne
+pl:Laboratorium Medyczne
 pt:Laboratório médico
 pt-BR:Laboratório médico
 ro:Laborator medical
@@ -6239,7 +6235,6 @@ en:Sample collection
 be:Аналізы
 de:Probenahme
 hi:नमूना संग्रह केंद्र
-pl:Punkt pobrań krwi
 ru:Анализы
 uk:Аналізи

@@ -6851,7 +6846,7 @@ ko:낡은 옷|낡은 옷 재활|낡은 옷 재활용
 lv:Tekstila konteiners|apģērba pārstrāde|drēbju pārsrāde|apģērba nodošana|drēbju nodošana|apģērba ziedošana
 mr:कपडे भंगारवाला|कपडे
 nb:Gamle klær|Levere gamle klær
-pl:Stare ubrania|Przekaż niepotrzebne rzeczy
+pl:Stare ubrania|Przekaz niepotrzebne rzeczy
 pt:Reciclagem de roupas|Roupas velhas
 pt-BR:Roupas velhas|Reciclar roupas velhas
 ro:Haine vechi|Înmânarea lucrurilor inutile
@@ -7151,7 +7146,7 @@ sr:Рециклажа обуће|Reciklaža obuće
 recycling-green_waste|@category_recycling
 en:4Recycling of Green Waste|5Organic Waste Recycling|5Green Waste Recycling|Food Waste|Garden Waste
 be:5Прыём арганічных адходаў|Прыём харчовых адходаў|5Здаць арганічныя адходы|4Збор арганічных адходаў|Збор харчовых адходаў|5Харчовыя адходы|6Садовыя адходы
-fr:4Déchets verts|biodéchets|alimentaires|organiques|valorisation
+fr:Déchets verts
 ru:5Приём органических отходов|Приём пищевых отходов|5Сдать органические отходы|4Сбор органических отходов|Сбор пищевых отходов|5Пищевые отходы|6Садовые отходы
 lv:Bioloģiskie atkritumi|bioloģisko atkritumu nodošana
 tr:5Yeşil Atıkların Geri Dönüşümü
@@ -7176,7 +7171,6 @@ fr:Station de vidange|4Vidange
 es:Estación de vaciado para caravanas
 it:4Camper service
 lv:Mobilo māju apkalpošana|kemperu apkalpošana
-pl:Opróżnianie toalet kamperów|Punkt odbioru ścieków|ścieki kamperów
 ru:4Слив нечистот|слив туалета|слив для туалета|нечистоты|канализация
 tr:6Karavan Çöplüğü|Karavanlar için çöplük
 uk:4Злив нечистот|слив туалету|слив для туалету|нечистоти|каналізація
@@ -8259,7 +8253,6 @@ en:Lift|Elevator
 fr:Ascenseur
 hi:उत्थापक
 lv:lifts
-pl:winda
 ru:Лифт
 sr:Лифт|Lift
 tr:Asansör
@@ -8316,7 +8309,6 @@ et:Sadul
 fr:Col
 it:4Sella
 lv:Pāreja|Kalnu pāreja
-pl:Przełęcz|Punkt siodłowy
 ru:4Седловина|5Перевал
 sr:Седло|Sedlo
 tr:Sırt|geçit|Dağ Eyeri
@@ -8691,7 +8683,7 @@ ja:1美容師|床屋|髪|パーマ|散髪|理髪|美容院/理容店
 ko:이발사|미용실|이발소|바버샵
 lv:Frizētava|U+2702|U+1F488|
 nb:Frisør
-pl:4Fryzjer|barber|włosy
+pl:4Fryzjer
 pt:Cabeleireiro|Cabeleireira|barbeiro
 pt-BR:Cabeleireiro|barbeiro
 ro:Coafor
@@ -10075,7 +10067,7 @@ lv:Volejbols
 mr:व्हॉलीबॉल
 nb:Volleyball
 nl:Volleyball
-pl:Piłka siatkowa|Siatkówka
+pl:Piłka siatkowa
 pt:Voleibol
 ro:Volei
 ru:Волейбол
@@ -10436,7 +10428,7 @@ ja:1水飲み場|飲料水|飲水
 ko:음수대|식수|분수식 물마시는 곳
 lv:4Dzeramais ūdens|U+1F6B0
 nb:4Drikkevann
-pl:4Picie wody|woda pitna|poidełko
+pl:4Picie wody|woda pitna
 pt:2Água potável|4bebedouro|bebedoiro
 pt-BR:2Água potável|4bebedouro
 ro:Apă de băut|apă potabilă
@@ -10647,7 +10639,7 @@ ko:수도꼭지|수마개
 lv:Ūdens krāns
 nb:Vannkran
 nl:Waterkraan
-pl:Kran
+pl:Dotknięcie wody
 pt:Torneira de água
 pt-BR:Torneira de água
 ro:Robinet cu apă
@@ -13004,7 +12996,6 @@ mr:पशुवैद्यकीय डॉक्टर|प्राण्या

 amenity-animal_shelter
 en:Animal Shelter
-pl:Schronisko dla zwierząt
 ru:Приют для животных

@charging_station
@@ -13027,7 +13018,7 @@ ja:充電ステーション|充電
 ko:충전 역|전기 자동차 충전소|전기차 충전소
 lv:4Uzlādes stacija|uzlāde
 nb:Ladestasjon|lading
-pl:3Stacja ładowania|ładowanie
+pl:Stacja ładowania|ładowanie
 pt:Posto de carregamento elétrico|Estação de carregamento elétrico|Ponto de carregamento elétrico|4carregamento elétrico
 pt-BR:Eletroposto|recarga|abastecimento
 ro:Stație încărcare|încărcare
@@ -13790,7 +13781,6 @@ fr:Distributeur de café|Café
 hi:4कॉफ़ी वितरक
 it:Distributore automatico di caffè|Caffè
 lv:4Kafijas automāts|kafija
-pl:Automat z kawą|kawa
 ru:3Кофейный автомат|кофе|кофемат
 sr:Аутомат за кафу|Automat za kafu
 tr:4Kahve Dispenseri|Kahve Makinesi
@@ -13809,7 +13799,6 @@ hi:4कंडोम वितरक मशीन
 it:Distributore di profilattici|Preservativi
 lv:4Prezervatīvu automāts|prezervatīvi
 sr:Аутомат за кондоме|Automat za kondome
-pl:Automat z prezerwatywami|prezerwatywy|kondomy
 ru:Автомат с презервативами|5презервативы|5кондомат
 tr:5Prezervatif Dispenseri|Kondom dispenseri
 uk:Автомат з презервативами|5презервативи|5кондомат
@@ -13866,7 +13855,6 @@ fr:Distributeur d'aliments|Aliments
 hi:4खाद्य वितरक
 it:Distributore automatico di alimenti|Macchinetta automatica|Snack
 lv:4Pārtikas automāts|4ēdiena automāts|uzkodas
-pl:Automat z przekąskami|jedzenie|przekąski
 ru:Автомат с едой|5перекус|4снэки
 sr:Аутомат за храну|Automat za hranu
 tr:Otomat|Yiyecek dispenseri|atıştırmalık
@@ -13898,7 +13886,7 @@ ko:주차티켓판매기|주차 티켓
 lv:Autostāvvietas apmaksa
 nb:4Parkeringsautomat
 nl:4Parkeerautomaat|Betaalautomaat parkeergarage
-pl:4Parkometr|Parkomat|Bilety parkingowe
+pl:4Parkometr|Parkomat
 pt:Máquina de pagamento de estacionamento|Máquina de bilhetes de estacionamento|bilhete de estacionamento|talão de estacionamento|Parcómetro|Parquíntemo
 pt-BR:Máquina venda de tíquetes de estacionamento
 ro:4Parcomat
@@ -13937,7 +13925,7 @@ ko:대중교통표 자동판매기
 lv:Biļešu automāts|biļetes
 nb:Billettmaskin for offentlig transport
 nl:Kaartjesautomaat voor openbaar vervoer
-pl:Automat biletowy do transportu publicznego|Biletomat
+pl:Automat biletowy do transportu publicznego
 pt:Máquina venda de bilhetes de transporte público
 pt-BR:Máquinas automáticas de venda de passagens de transporte público
 ro:Automat de vânzare a biletelor pentru transportul public
@@ -13965,7 +13953,6 @@ fr:Distributeur de journaux|Journaux
 hi:4समाचार पत्र वितरक
 it:Distributore automatico di giornali|Riviste
 lv:4Avīžu automāts|avīzes|4prese
-pl:Automat z gazetami|prasa
 ru:Газетный автомат|газетомат|3газеты|4пресса
 tr:4Gazete dispenseri|Gazetelik
 uk:Газетний автомат|газетомат|3газети|4преса
@@ -13983,7 +13970,6 @@ fr:Distributeur de bonbons|Bonbons
 hi:4मिठाई वितरक
 it:Distributore di dolci|Caramelle
 lv:4Saldumu automāts|saldumi
-pl:Automat ze słodyczami
 ru:Автомат со сладостями|4сладости|4конфеты
 tr:Tatlı dispenseri|şekerler
 uk:Автомат із солодощами|4солодощі|4цукерки
@@ -13997,7 +13983,6 @@ et:4Koeraväljaheidete kottide automaat|Loomade väljaheited
 fr:5Distributeur de sacs à excréments
 hi:4मलमूत्र थैली वितरक
 lv:Suņu izkārnījumu maisiņu automāts|maisiņi suņu izkārnījumiem|suņu higiēnas maisiņi
-pl:Automat z workami na odchody|ekskrementy|psie odchody
 ru:5Пакеты для экскрементов|Какашки|Пакеты для какашек
 tr:5Dışkı torbası dispenseri
 uk:5Мішки для екскрементів|Какашки|5Пакети для какашок
@@ -14012,7 +13997,6 @@ et:4Pakiautomaat
 fr:Consigne automatique pour colis|3locker
 hi:4पार्सल भंड़ार
 lv:4Pakomāts|paku skapis
-pl:Paczkomat|Automat paczkowy
 ru:3Почтомат|Постамат|5Получение посылок
 sr:Пакетомат|Paketomat
 tr:4kilitli dolap|4kitli dolap|kasa
@@ -14206,7 +14190,6 @@ mr:कारखाना चिमणी

 man_made-crane
 en:Crane
-pl:Żuraw
 ru:Кран

 man_made-tower|man_made-flare
@@ -14348,7 +14331,7 @@ ko:중고 판매점
 lv:Lietotu preču veikals|lietotas mantas
 nb:Bruktbutikk
 nl:Tweedehandswinkel
-pl:Sklep z używaną odzieżą
+pl:Sklep z używaną ręką
 pt:Loja de segunda mão
 pt-BR:Loja de segunda mão
 ro:Magazin second-hand
@@ -15401,7 +15384,7 @@ ko:운전학원|자동차 운전학원
 lv:4Autoskola
 nb:Kjøreskole
 nl:Rijschool
-pl:Szkoła jazdy|Nauka jazdy
+pl:Szkoła jazdy
 pt:Escola de condução
 pt-BR:4Autoescola|CFC
 ru:4Автошкола|курсы вождения
@@ -15523,7 +15506,7 @@ ko:아이스크림 스탠드|아이스크림 가판대
 lv:Saldējums
 nb:4Iskrem
 nl:4Ijskraam|Ijsstand
-pl:Lodziarnia|Stoisko z lodami|lody
+pl:Stoisko z lodami|lody
 pt:4Gelados|gelataria|geladaria|3banca de gelados
 pt-BR:Sorveteria
 ro:Chioșc cu înghețată
@@ -15847,7 +15830,7 @@ lv:Pulcēšanās punkts
 mr:आपत्कालीन विधानसभा पॉइंट
 nb:Nødsamlingssted
 nl:Verzamelpunt voor noodgevallen
-pl:Punkt zborny|Miejsce zbiórki do ewakuacji
+pl:Punkt Zgromadzeń Awaryjnych
 pt:Ponto de Reunião de Emergência
 ro:Punct de adunare de urgență
 ru:Пункт аварийного сбора
@@ -16010,7 +15993,7 @@ lv:4Ārkārtas kalnu glābšana
 mr:आपत्कालीन पर्वतीय बचाव
 nb:4Nød-fjellredning
 nl:4Nood-bergredding
-pl:4Ratownictwo górskie
+pl:4Ratownictwo górskie awaryjne
 pt:Resgate de montanha de emergência
 pt-BR:4Resgate de montanha de emergência
 ro:4Salvare montană de urgență
@@ -16049,7 +16032,7 @@ ko:피트니스 스테이션
 lv:Vingrošanas iekārtas|fitnesa stacija
 nb:Treningsstasjon
 nl:3Fitness-Station
-pl:6Stacja fitness|Przyrządy do ćwiczeń
+pl:Stacja fitness|Przyrządy do ćwiczeń
 pt:Estação de fitness|Máquina de exercícios pública
 pt-BR:Estação de fitness
 ro:Sală de fitness
@@ -17037,7 +17020,7 @@ it:Negozio di caffè
 ja:コーヒー屋
 lv:Kafijas veikals|kafija
 nl:Koffiewinkel
-pl:Sklep z kawą|kawa
+pl:Sklep z kawą
 pt:Loja de café
 pt-BR:Loja de café
 ru:Кофе
@@ -17053,7 +17036,6 @@ hi:3कपड़े की दुकान
 it:Merceria
 lv:Auduma veikals|tekstilu veikals
 nl:Stoffenwinkel
-pl:Tkaniny
 pt:Loja de tecidos
 pt-BR:Loja de aviamentos
 ru:Текстиль|Ткани
@@ -17068,7 +17050,7 @@ de:4Geldverleiher
 et:Rahalaenutus
 hi:4हवलदार|4साहूकार
 lv:Naudas aizdevējs
-pl:Pożyczkodawca
+pl:ożyczkodawca
 pt:Prestamista
 pt-BR:Prestamista
 ru:Ростовщик
@@ -17088,7 +17070,7 @@ ja:CDショップ
 lv:mūzikas veikals
 nb:Platebutikk|vinyl
 nl:Muziekwinkel
-pl:Sklep muzyczny|winyle
+pl:Sklep muzyczny
 pt:Loja de música
 pt-BR:Loja de música
 ru:Музыка
@@ -17285,7 +17267,7 @@ ko:가방 판매점
 lv:Somas
 nb:Veskerbutikk
 nl:Tassenwinkel
-pl:Sklep z torbami|torebki
+pl:Sklep z torbami
 pt:Loja de bolsas
 pt-BR:Loja de bolsas
 ro:Magazin de genti
@@ -17658,7 +17640,7 @@ ko:그림 물감
 lv:Krāsas
 nb:Maling
 nl:Verfwinkel
-pl:Malatura|farby
+pl:Malatura
 pt:Tintas
 pt-BR:Tintas
 ro:Vopsele
@@ -17977,7 +17959,6 @@ ja:トラック
 lv:Skrejceļš|Skriešanas celiņš
 mr:ट्रॅक
 nl:Parcours
-pl:Tor wyścigowy|bieżnia
 pt:Pista para desportos não motorizados
 pt-BR:Pista para esportes não motorizados
 ru:Беговая дорожка
@@ -18648,7 +18629,7 @@ ko:애완동물 미용
 mr:पाळीव प्राणी ग्रूमिंग
 nb:Kjæledyrpleie
 nl:Huisdierverzorging
-pl:Pielęgnacja zwierząt|Groomer
+pl:Pielęgnacja zwierząt
 pt:Salão de banhos e tosquia
 pt-BR:Banho e tosa
 ro:Îngrijirea animalelor de companie
@@ -19074,13 +19055,3 @@ uk:5Камера схову|4багаж
 vi:Tủ khóa hành lý
 zh-Hans:行李寄存柜
 zh-Hant:行李寄存櫃
-
-office-security
-en:4Security Office
-pl:Biuro ochrony|ochrona
-ru:ЧОП|4Охрана
-
-building-guardhouse
-en:4Guard
-pl:Budka ochrony|Wartownia|ochrona
-ru:4Сторож|4Охрана
--- a/data/categories_cuisines.txt
+++ b/data/categories_cuisines.txt
@@ -502,7 +502,7 @@ ja:アイスクリーム
 ko:아이스크림
 nb:Iskrem
 nl:Ijs
-pl:Lody
+pl:Lodziarnia
 pt:Gelados
 pt-BR:Sorvete
 ro:Înghețată
@@ -612,7 +612,7 @@ ja:ホットケーキ|クレープ
 ko:팬케이크|크레이프
 nb:Pannekake|Crepe
 nl:Pannenkoek
-pl:Naleśniki|Naleśnikarnia
+pl:Naleśnik|Naleśnikarnia
 pt:Panqueca|panquecas|crepes|crepe
 pt-BR:Panqueca|panquecas|crepes|crepe
 ro:Clătită|Crep
@@ -681,7 +681,7 @@ it:Pizza
 ja:ピザ
 ko:피자
 nb:Pizza
-pl:Pizza|pizzeria
+pl:Pizzeria
 pt:Pizza|piza|pizaria
 pt-BR:Pizza|pizzaria|pizaria
 ro:Pizza
@@ -716,7 +716,7 @@ it:Ramen
 ja:ラーメン
 ko:라면
 nb:Ramen
-pl:Ramen
+pl:Zupa ramen
 pt:Lámen|rāmen
 pt-BR:Lámen|rāmen
 ro:Ramen
@@ -788,7 +788,7 @@ it:Salsicce
 ja:ソーセージ
 ko:소시지
 nb:Pølse
-pl:Kiełbasa|Kiełbasiarnia
+pl:Kiełbasiarnia
 pt:Salsicha|salsichas
 pt-BR:Linguiça
 ro:Cârnat
@@ -1004,7 +1004,7 @@ it:Tè
 ja:紅茶
 ko:차
 nb:Te
-pl:Herbata|Herbaciarnia
+pl:Herbaciarnia
 pt:Chá
 pt-BR:Chá
 ro:Ceai
@@ -1419,7 +1419,7 @@ sr:Веганска|Вегетаријанска|Вегетаријанци|Ве
 # ja:牛丼|ビーフボウル
 # ko:쇠고기 덮밥
 # nb:Biffbolle
-# pl:Gyūdon|Gyudon
+# pl:Gyūdon
 # pt:Tigela com carne bovina|Gyudon
 # pt-BR:Tigela com carne bovina|Gyudon
 # ro:Ciorbă de văcuță
@@ -1487,7 +1487,7 @@ sr:Веганска|Вегетаријанска|Вегетаријанци|Ве
 # ja:ブッシェンシャンク
 # ko:와인 레스토랑
 # nb:Buschenschank
-# pl:Buschenschank|Heuriger
+# pl:Winiarnia
 # pt:Buschenschank|Heuriger
 # pt-BR:Buschenschank|Heuriger
 # ro:Tavernă
--- a/data/editor.config
+++ b/data/editor.config
@@ -462,9 +462,6 @@
        <include group="poi" />
        <include field="operator" />
      </type>
-      <type id="building-guardhouse">
-        <include group="poi" />
-      </type>
      <!-- Too generic to be added -->
      <type id="craft" can_add="no">
        <include group="poi_internet" />
@@ -705,9 +702,6 @@
      <type id="office-ngo" group="office">
        <include group="poi_internet" />
      </type>
-      <type id="office-security" group="office">
-        <include group="poi_internet" />
-      </type>
      <type id="office-telecommunication" group="office">
        <include group="poi_internet" />
      </type>
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -304,8 +304,7 @@ waterway|dam;200;
 amenity|charging_station|motorcar;[amenity=charging_station][motorcar?];;name;int_name;201;
 leisure|golf_course;202;
 highway|service|bridge;[highway=service][bridge?];;name;int_name;203;
-# ~250K usages.
-power|portal;204;
+highway|pedestrian|square;[highway=pedestrian][place=square];;name;int_name;204;
 # Marsh 500K usages, wet_meadow 160K
 natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205;
 leisure|stadium;206;
@@ -874,10 +873,8 @@ barrier|kissing_gate;749;
 barrier|turnstile;750;
 landuse|industrial|mine;[landuse=industrial][industrial=mine];;name;int_name;751;
 landuse|flowerbed;752;
-# Used for barrier|yes in OM
-deprecated|OM;753;x
-# Used for barrier|wicket_gate in OM
-deprecated|OM;754;x
+deprecated|deprecated;753;x
+deprecated|deprecated;754;x
 deprecated|deprecated;755;x
 deprecated|deprecated;756;x
 deprecated|deprecated;757;x
@@ -999,7 +996,7 @@ deprecated|deprecated;871;x
 deprecated|deprecated;872;x
 area:highway|pedestrian;873;
 area:highway|unclassified;874;
-highway|pedestrian|square;[highway=pedestrian][place=square];;;;875;
+deprecated|deprecated;875;x
 deprecated|deprecated;876;x
 area:highway|cycleway;877;
 entrance|exit;878;
@@ -1755,5 +1752,3 @@ post_office|post_partner;1626;
 amenity|ranger_station;1627;
 leisure|escape_game;1628;
 amenity|luggage_locker;1629;
-building|guardhouse;[building=guardhouse],[amenity=security_booth],[amenity=checkpoint];;;;1630;
-office|security;1631;
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -162,7 +162,6 @@ recycling:plastic_packaging=yes : recycling:plastic=yes
 recycling:glass=yes             : recycling:glass_bottles=yes
 recycling:organic=yes           : recycling:green_waste=yes
 recycling:garden_waste=yes      : recycling:green_waste=yes
-recycling:food_waste=yes        : recycling:green_waste=yes

 recycling:paper_packaging=yes   : recycling:paper=yes
 recycling:newspaper=yes         : recycling:paper=yes
--- a/data/styles/default/dark/symbols/aircraft-m.svg
+++ b/data/styles/default/dark/symbols/aircraft-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 <title>aircraft-m</title>
- <path fill="#6E4426" d="m19 15.1v-1.3l-5.4737-3.25v-3.575c0-0.5395-0.45842-0.975-1.0263-0.975s-1.0263 0.4355-1.0263 0.975v3.575l-5.4737 3.25v1.3l5.4737-1.625v3.575l-1.3684 0.975v0.975l2.3947-0.65 2.3947 0.65v-0.975l-1.3684-0.975v-3.575l5.4737 1.625z"/>
+ <path fill="#51585E" opacity=".6" d="m19 15.1v-1.3l-5.4737-3.25v-3.575c0-0.5395-0.45842-0.975-1.0263-0.975s-1.0263 0.4355-1.0263 0.975v3.575l-5.4737 3.25v1.3l5.4737-1.625v3.575l-1.3684 0.975v0.975l2.3947-0.65 2.3947 0.65v-0.975l-1.3684-0.975v-3.575l5.4737 1.625z"/>
 </svg>
--- a/data/styles/default/dark/symbols/anchor-m.svg
+++ b/data/styles/default/dark/symbols/anchor-m.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
-	<path d="m10 18.127q-1.2393 0-2.5396-0.44697-1.3003-0.44696-2.3567-1.219t-1.7371-1.8082-0.68061-2.2145v-2.438l3.2507 2.438-1.2596 1.2596q0.58918 1.0362 1.8691 1.7879 1.2799 0.75172 2.6412 0.95488v-7.253h-2.438v-1.6253h2.438v-0.95488q-0.71108-0.26411-1.1682-0.88377t-0.45712-1.412q0-1.0158 0.71108-1.7269 0.71108-0.71108 1.7269-0.71108 1.0158 0 1.7269 0.71108 0.71108 0.71109 0.71108 1.7269 0 0.79234-0.45712 1.412t-1.1682 0.88377v0.95488h2.438v1.6253h-2.438v7.253q1.3612-0.20316 2.6412-0.95488 1.2799-0.75171 1.8691-1.7879l-1.2596-1.2596 3.2507-2.438v2.438q0 1.1784-0.68061 2.2145t-1.7371 1.8082-2.3567 1.219q-1.3003 0.44697-2.5396 0.44697zm0-13.003q0.34538 0 0.57902-0.23364t0.23364-0.57902-0.23364-0.57902-0.57902-0.23364-0.57902 0.23364-0.23364 0.57902 0.23364 0.57902 0.57902 0.23364z" fill="#6E4426"/>
+	<path d="m10 18.127q-1.2393 0-2.5396-0.44697-1.3003-0.44696-2.3567-1.219t-1.7371-1.8082-0.68061-2.2145v-2.438l3.2507 2.438-1.2596 1.2596q0.58918 1.0362 1.8691 1.7879 1.2799 0.75172 2.6412 0.95488v-7.253h-2.438v-1.6253h2.438v-0.95488q-0.71108-0.26411-1.1682-0.88377t-0.45712-1.412q0-1.0158 0.71108-1.7269 0.71108-0.71108 1.7269-0.71108 1.0158 0 1.7269 0.71108 0.71108 0.71109 0.71108 1.7269 0 0.79234-0.45712 1.412t-1.1682 0.88377v0.95488h2.438v1.6253h-2.438v7.253q1.3612-0.20316 2.6412-0.95488 1.2799-0.75171 1.8691-1.7879l-1.2596-1.2596 3.2507-2.438v2.438q0 1.1784-0.68061 2.2145t-1.7371 1.8082-2.3567 1.219q-1.3003 0.44697-2.5396 0.44697zm0-13.003q0.34538 0 0.57902-0.23364t0.23364-0.57902-0.23364-0.57902-0.57902-0.23364-0.57902 0.23364-0.23364 0.57902 0.23364 0.57902 0.57902 0.23364z" fill="#51585E" opacity=".6"/>
 </svg>
--- a/data/styles/default/dark/symbols/animal-m.svg
+++ b/data/styles/default/dark/symbols/animal-m.svg
@@ -14,6 +14,7 @@
  <path
     id="Path"
     d="M 16.069622,1.670709 C 13.882633,4.8501398 13.571882,7.5052255 11.149025,9.6194413 8.8344727,11.63888 4.5882073,10.945616 4.5882073,13.858771 v 1.059733 c 0,1.059883 1.0934782,2.068306 1.0934782,3.179442 v 1.059883 c 0,1.589704 -0.5467534,1.589704 -1.0934782,3.179426 h 1.0934782 l 2.1869842,-3.179426 v 3.179426 h 1.640192 v -6.359018 h 1.6402033 v 6.359018 h 1.640205 v -4.769297 l 1.640205,4.769297 h 1.093492 l -1.674454,-6.657053 c 0.644611,-0.381233 0.58092,-1.085969 0.58092,-1.821488 v -3.179419 l 2.460359,-5.8292145 2.460373,0.7948732 c 0,-0.074715 -8.44e-4,-0.734467 0,-0.7948732 0,0 -0.399405,-0.3871019 -0.546738,-0.5298655 L 16.069669,1.670589 Z"
-     fill="#6E4426"
+     fill="#51585E" 
+     opacity=".6"
     style="stroke-width:1.47601" />
 </svg>
--- a/data/styles/default/dark/symbols/archaeological-site-m.svg
+++ b/data/styles/default/dark/symbols/archaeological-site-m.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 <title>wayside_shrine-m</title>
 <g transform="matrix(1.1429 0 0 1.1429 2.8815 2.8583)">
-  <path id="archaeological-site" d="m3.4787 0.12402v1.125h1.125c0.67373 0 0.94628 1.1735 1.0547 2.1445-1.0938-0.85089-2.1516-1.155-3.0586-0.98438-1.1591 0.21803-1.9336 1.2859-1.9336 2.4961 0 0.94716 0.35113 1.7762 0.94922 2.6367 0.5227 0.75204 1.2598 1.6201 2.1797 2.6719 0.41226 1.5289 1.1712 2.929 1.9336 3.6914v0.84375l-1.125 0.5625v0.5625h6.75v-0.5625l-1.125-0.5625v-0.84375c0.76241-0.76241 1.5213-2.1625 1.9336-3.6914 0.91986-1.0518 1.657-1.9198 2.1797-2.6719 0.59809-0.86051 0.94922-1.6896 0.94922-2.6367 0-1.2102-0.7745-2.2781-1.9336-2.4961-0.90701-0.17061-1.9648 0.13348-3.0586 0.98438 0.1084-0.97108 0.38096-2.1445 1.0547-2.1445h1.125v-1.125zm-0.70312 3.4102c0.57357-0.10789 1.5305 0.1139 2.6367 1.125-1.2544 0.15568-1.9336 1.2581-1.9336 3.3398 0 0.035096-5.431e-4 0.070242 0 0.10547-0.38309-0.4451-0.70179-0.83932-0.94922-1.1953-0.52691-0.7581-0.73828-1.3145-0.73828-2.0039 0-0.78786 0.34979-1.2517 0.98438-1.3711zm9.8438 0c0.21162-0.030504 0.40385-0.029842 0.5625 0 0.63458 0.11937 0.98437 0.58323 0.98437 1.3711 0 0.68937-0.21137 1.2458-0.73828 2.0039-0.24743 0.35599-0.56613 0.75021-0.94922 1.1953 5.44e-4 -0.035226 0-0.070374 0-0.10547 0-2.0817-0.67921-3.1842-1.9336-3.3398 0.80028-0.73143 1.5207-1.0452 2.0742-1.125z" fill="#6E4426"/>
+  <path id="archaeological-site" d="m3.4787 0.12402v1.125h1.125c0.67373 0 0.94628 1.1735 1.0547 2.1445-1.0938-0.85089-2.1516-1.155-3.0586-0.98438-1.1591 0.21803-1.9336 1.2859-1.9336 2.4961 0 0.94716 0.35113 1.7762 0.94922 2.6367 0.5227 0.75204 1.2598 1.6201 2.1797 2.6719 0.41226 1.5289 1.1712 2.929 1.9336 3.6914v0.84375l-1.125 0.5625v0.5625h6.75v-0.5625l-1.125-0.5625v-0.84375c0.76241-0.76241 1.5213-2.1625 1.9336-3.6914 0.91986-1.0518 1.657-1.9198 2.1797-2.6719 0.59809-0.86051 0.94922-1.6896 0.94922-2.6367 0-1.2102-0.7745-2.2781-1.9336-2.4961-0.90701-0.17061-1.9648 0.13348-3.0586 0.98438 0.1084-0.97108 0.38096-2.1445 1.0547-2.1445h1.125v-1.125zm-0.70312 3.4102c0.57357-0.10789 1.5305 0.1139 2.6367 1.125-1.2544 0.15568-1.9336 1.2581-1.9336 3.3398 0 0.035096-5.431e-4 0.070242 0 0.10547-0.38309-0.4451-0.70179-0.83932-0.94922-1.1953-0.52691-0.7581-0.73828-1.3145-0.73828-2.0039 0-0.78786 0.34979-1.2517 0.98438-1.3711zm9.8438 0c0.21162-0.030504 0.40385-0.029842 0.5625 0 0.63458 0.11937 0.98437 0.58323 0.98437 1.3711 0 0.68937-0.21137 1.2458-0.73828 2.0039-0.24743 0.35599-0.56613 0.75021-0.94922 1.1953 5.44e-4 -0.035226 0-0.070374 0-0.10547 0-2.0817-0.67921-3.1842-1.9336-3.3398 0.80028-0.73143 1.5207-1.0452 2.0742-1.125z" fill="#51585E" fill-opacity=".6"/>
 </g>
 </svg>
--- a/data/styles/default/dark/symbols/artwork-m.svg
+++ b/data/styles/default/dark/symbols/artwork-m.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.9987 18h8.0023" stroke-linecap="round" stroke-width="1.333" stroke="#6E4426"/>
- <path d="m9.332 20.666h5.3357" stroke-linecap="round" stroke-width="1.333" stroke="#6E4426"/>
- <path d="m10.84 3.3379-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#6E4426"/>
- <path d="m10.844 8.004-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#6E4426"/>
- <path d="m10.844 12.671-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#6E4426"/>
-</svg>
+ <path d="m7.9987 18h8.0023" stroke-linecap="round" stroke-width="1.333" stroke="#51585E" opacity=".6"/>
+ <path d="m9.332 20.666h5.3357" stroke-linecap="round" stroke-width="1.333" stroke="#51585E" opacity=".6"/>
+ <path d="m10.84 3.3379-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#51585E" opacity=".6"/>
+ <path d="m10.844 8.004-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#51585E" opacity=".6"/>
+ <path d="m10.844 12.671-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#51585E" opacity=".6"/>
+</svg>
--- a/data/styles/default/dark/symbols/cannon-m.svg
+++ b/data/styles/default/dark/symbols/cannon-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>cannon-m</title>
-	<g transform="translate(.00041566 .58395)" fill="#6E4426">
+	<g transform="translate(.00041566 .58395)" fill="#51585E" opacity=".6">
 		<ellipse cx="11.493" cy="13.12" rx="1.0525" ry="1.0607"/>
 		<path d="m17.293 12.638c0.01044 0.61735 0.02409 1.2722 0.20874 1.8246 0.33567 1.0041 0.95552 1.9565 1.8216 2.6018 0.86605 0.64534 1.935 1.0008 3.0151 1.0032l0.0028-0.88087c-0.88661-0.0019-1.7795-0.2995-2.4904-0.82921-1.3441-1.2032-1.7147-2.2038-1.0302-3.6409z"/>
 		<path d="m2.5233 4.5994-0.86524 3.1113 5.3476 1.6856a5.8211 5.8664 0 0 1 4.4863-2.1426 5.8211 5.8664 0 0 1 5.8007 5.3848l1.2207 0.38476c1.1721 0.36946 2.4033-0.35891 2.7324-1.543 0.32915-1.184-0.36088-2.4033-1.545-2.7324z"/>
--- a/data/styles/default/dark/symbols/locomotive-m.svg
+++ b/data/styles/default/dark/symbols/locomotive-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>locomotive-m</title>
-	<path d="m13.789 8.0953h5.6461v7.5849h-0.99317q-0.19047-0.67345-0.75508-1.1156-0.56461-0.44216-1.2857-0.44216-0.63264 0-1.1768 0.36054-0.5442 0.36053-0.7959 0.99317h0.13605q0.21769-0.5238 0.71427-0.87073 0.49658-0.34694 1.1224-0.34694 0.72787 0 1.2857 0.47618 0.55781 0.47618 0.66665 1.1905h1.0816v1.1768h-1.2449q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.58502 0-1.0646-0.30612-0.47958-0.30612-0.73128-0.82311h-0.38774q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.57822 0-1.0578-0.30952-0.47957-0.30952-0.73126-0.8197h-0.40816q-0.09528 0.48298-0.48298 0.8061-0.38775 0.32312-0.89114 0.32312-0.50339 0-0.89114-0.31972-0.38774-0.31972-0.48299-0.8095h-0.027208v1.0952h-3.6666v-0.76188h0.51019l1.1836-1.7551h0.36734q0.32653-0.2381 0.54421-0.88773 0.21767-0.64965 0.21767-1.5204 0-0.82311-0.21087-1.483-0.21089-0.65985-0.55102-0.92515h0.60543l-1.0272-3.3196h3.9183l-1.0204 3.3196q0.38094 0.35373 0.59182 0.95576 0.21088 0.60202 0.21088 1.4387 0 0.72787-0.16326 1.2959-0.16326 0.56801-0.44216 0.91494l0.16326-0.02721q0.081624-0.01365 0.17006-0.01365h0.013654q0.23809-0.33332 0.38094-0.89454 0.14286-0.56121 0.14286-1.2551 0-0.87073-0.21768-1.5204-0.21768-0.64965-0.5442-0.88773h0.70066v-0.81631q0-0.2721 0.23129-0.45917 0.23129-0.18707 0.5374-0.18707 0.31292 0 0.5442 0.18707 0.23129 0.18707 0.23129 0.45917v0.81631h0.39454v-1.2925q0-0.2585 0.23129-0.44557 0.23129-0.18706 0.5374-0.18706 0.34013 0 0.55441 0.19387 0.21428 0.19387 0.21428 0.43876v1.2925h0.97957t0-2.7754zm2.6258 3.8162q0 0.15646 0.10544 0.2585 0.10544 0.10204 0.2551 0.10204h1.6122q0.15646 0 0.2585-0.10204 0.10204-0.10204 0.10204-0.2585v-2.7822q0-0.14966-0.10204-0.2551-0.10204-0.10544-0.2585-0.10544h-1.6122q-0.14965 0-0.2551 0.10544-0.10544 0.10544-0.10544 0.2551 0 0 0 2.7822zm3.7958-4.9727v0.89113h-7.1903v-0.89113h7.1903zm-14.728 4.0611q0.31973 0 0.58843 0.67006 0.26871 0.67005 0.26871 1.602 0 0.94555-0.26871 1.6122-0.2687 0.66665-0.58843 0.66665-0.31972 0-0.58843-0.66665-0.2687-0.66666-0.2687-1.6122 0-0.93195 0.2687-1.602 0.26871-0.67006 0.58843-0.67006zm8.1699 5.3536h-0.7823q-0.13605 0-0.23468-0.09859-0.09864-0.09869-0.09864-0.23469 0-0.13605 0.09864-0.23128 0.09863-0.09528 0.23468-0.09528h0.65305q-0.15646-0.30612-0.44217-0.49319-0.28571-0.18707-0.65305-0.18707-0.51019 0-0.87073 0.36393-0.36053 0.36394-0.36053 0.86733 0 0.51018 0.36053 0.87073 0.36054 0.36053 0.87073 0.36053 0.46938 0 0.82651-0.32652 0.35714-0.32653 0.39795-0.7959zm1.6598-0.65985h0.84352q0.13605 0 0.23129 0.09528 0.09524 0.09528 0.09524 0.23128 0 0.13605-0.09524 0.23469-0.09524 0.09859-0.23129 0.09859h-0.97277q0.04081 0.48298 0.39794 0.8027 0.35714 0.31972 0.82651 0.31972 0.51019 0 0.86733-0.36393 0.35713-0.36393 0.35713-0.86732 0-0.50339-0.35713-0.86733-0.35714-0.36393-0.86733-0.36393-0.36734 0-0.65304 0.18707-0.28571 0.18707-0.44217 0.49319zm-6.0203-9.0202h-3.8162l0.38776-0.90474h3.0271s0.40134 0.90474 0.40134 0.90474zm-4.1632 0.2653h4.5237v0.34012h-4.5237v-0.34012zm9.2719 8.5372q-0.24488-0.61904-0.78909-0.98638-0.54421-0.36734-1.1836-0.36734-0.73468 0-1.2993 0.44897-0.56461 0.44897-0.74147 1.1088h-0.73468q0.0748 0.05442 0.13945 0.11224 0.06466 0.05783 0.12584 0.13266h0.55102q0.12244-0.72107 0.67345-1.1938 0.551-0.47279 1.2857-0.47279 0.60543 0 1.0986 0.33333 0.49319 0.33332 0.73128 0.88433 0 0 0.14285 0zm-6.6053 0.44897q0.10884-0.13605 0.2585-0.24489h-0.59863v0.24489t0.34013 0z" fill="#6E4426"/>
+	<path d="m13.789 8.0953h5.6461v7.5849h-0.99317q-0.19047-0.67345-0.75508-1.1156-0.56461-0.44216-1.2857-0.44216-0.63264 0-1.1768 0.36054-0.5442 0.36053-0.7959 0.99317h0.13605q0.21769-0.5238 0.71427-0.87073 0.49658-0.34694 1.1224-0.34694 0.72787 0 1.2857 0.47618 0.55781 0.47618 0.66665 1.1905h1.0816v1.1768h-1.2449q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.58502 0-1.0646-0.30612-0.47958-0.30612-0.73128-0.82311h-0.38774q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.57822 0-1.0578-0.30952-0.47957-0.30952-0.73126-0.8197h-0.40816q-0.09528 0.48298-0.48298 0.8061-0.38775 0.32312-0.89114 0.32312-0.50339 0-0.89114-0.31972-0.38774-0.31972-0.48299-0.8095h-0.027208v1.0952h-3.6666v-0.76188h0.51019l1.1836-1.7551h0.36734q0.32653-0.2381 0.54421-0.88773 0.21767-0.64965 0.21767-1.5204 0-0.82311-0.21087-1.483-0.21089-0.65985-0.55102-0.92515h0.60543l-1.0272-3.3196h3.9183l-1.0204 3.3196q0.38094 0.35373 0.59182 0.95576 0.21088 0.60202 0.21088 1.4387 0 0.72787-0.16326 1.2959-0.16326 0.56801-0.44216 0.91494l0.16326-0.02721q0.081624-0.01365 0.17006-0.01365h0.013654q0.23809-0.33332 0.38094-0.89454 0.14286-0.56121 0.14286-1.2551 0-0.87073-0.21768-1.5204-0.21768-0.64965-0.5442-0.88773h0.70066v-0.81631q0-0.2721 0.23129-0.45917 0.23129-0.18707 0.5374-0.18707 0.31292 0 0.5442 0.18707 0.23129 0.18707 0.23129 0.45917v0.81631h0.39454v-1.2925q0-0.2585 0.23129-0.44557 0.23129-0.18706 0.5374-0.18706 0.34013 0 0.55441 0.19387 0.21428 0.19387 0.21428 0.43876v1.2925h0.97957t0-2.7754zm2.6258 3.8162q0 0.15646 0.10544 0.2585 0.10544 0.10204 0.2551 0.10204h1.6122q0.15646 0 0.2585-0.10204 0.10204-0.10204 0.10204-0.2585v-2.7822q0-0.14966-0.10204-0.2551-0.10204-0.10544-0.2585-0.10544h-1.6122q-0.14965 0-0.2551 0.10544-0.10544 0.10544-0.10544 0.2551 0 0 0 2.7822zm3.7958-4.9727v0.89113h-7.1903v-0.89113h7.1903zm-14.728 4.0611q0.31973 0 0.58843 0.67006 0.26871 0.67005 0.26871 1.602 0 0.94555-0.26871 1.6122-0.2687 0.66665-0.58843 0.66665-0.31972 0-0.58843-0.66665-0.2687-0.66666-0.2687-1.6122 0-0.93195 0.2687-1.602 0.26871-0.67006 0.58843-0.67006zm8.1699 5.3536h-0.7823q-0.13605 0-0.23468-0.09859-0.09864-0.09869-0.09864-0.23469 0-0.13605 0.09864-0.23128 0.09863-0.09528 0.23468-0.09528h0.65305q-0.15646-0.30612-0.44217-0.49319-0.28571-0.18707-0.65305-0.18707-0.51019 0-0.87073 0.36393-0.36053 0.36394-0.36053 0.86733 0 0.51018 0.36053 0.87073 0.36054 0.36053 0.87073 0.36053 0.46938 0 0.82651-0.32652 0.35714-0.32653 0.39795-0.7959zm1.6598-0.65985h0.84352q0.13605 0 0.23129 0.09528 0.09524 0.09528 0.09524 0.23128 0 0.13605-0.09524 0.23469-0.09524 0.09859-0.23129 0.09859h-0.97277q0.04081 0.48298 0.39794 0.8027 0.35714 0.31972 0.82651 0.31972 0.51019 0 0.86733-0.36393 0.35713-0.36393 0.35713-0.86732 0-0.50339-0.35713-0.86733-0.35714-0.36393-0.86733-0.36393-0.36734 0-0.65304 0.18707-0.28571 0.18707-0.44217 0.49319zm-6.0203-9.0202h-3.8162l0.38776-0.90474h3.0271s0.40134 0.90474 0.40134 0.90474zm-4.1632 0.2653h4.5237v0.34012h-4.5237v-0.34012zm9.2719 8.5372q-0.24488-0.61904-0.78909-0.98638-0.54421-0.36734-1.1836-0.36734-0.73468 0-1.2993 0.44897-0.56461 0.44897-0.74147 1.1088h-0.73468q0.0748 0.05442 0.13945 0.11224 0.06466 0.05783 0.12584 0.13266h0.55102q0.12244-0.72107 0.67345-1.1938 0.551-0.47279 1.2857-0.47279 0.60543 0 1.0986 0.33333 0.49319 0.33332 0.73128 0.88433 0 0 0.14285 0zm-6.6053 0.44897q0.10884-0.13605 0.2585-0.24489h-0.59863v0.24489t0.34013 0z" fill="#51585E" opacity=".6"/>
 </svg>
--- a/data/styles/default/dark/symbols/monument-m.svg
+++ b/data/styles/default/dark/symbols/monument-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 <title>monument-m</title>
- <g fill="none" fill-rule="evenodd">
-  <g id="monument-m" fill-rule="nonzero">
-   <path id="Shape" d="m18.188 18.75h-12.375c-0.31078 0-0.5625 0.25172-0.5625 0.5625v1.125c0 0.31078 0.25172 0.5625 0.5625 0.5625h12.375c0.31078 0 0.5625-0.25172 0.5625-0.5625v-1.125c0-0.31078-0.25172-0.5625-0.5625-0.5625zm-2.7724-12.208c-0.025746-0.25838-0.14016-0.49987-0.32379-0.68344l-2.6937-2.6933c-0.21973-0.21973-0.57586-0.21973-0.79559 0l-2.693 2.6933c-0.18363 0.18357-0.29804 0.42507-0.32379 0.68344l-1.0853 11.083h9zm-1.7276 7.2584c0 0.225-0.225 0.45-0.45 0.45h-2.475c-0.225 0-0.45-0.225-0.45-0.45v-1.35c0-0.225 0.225-0.45 0.45-0.45h2.475c0.225 0 0.45 0.225 0.45 0.45z" fill="#6E4426"/>
+ <g fill="#51585E" fill-rule="evenodd">
+  <g id="monument-m" fill="#6E4426" fill-rule="nonzero">
+   <path id="Shape" d="m18.188 18.75h-12.375c-0.31078 0-0.5625 0.25172-0.5625 0.5625v1.125c0 0.31078 0.25172 0.5625 0.5625 0.5625h12.375c0.31078 0 0.5625-0.25172 0.5625-0.5625v-1.125c0-0.31078-0.25172-0.5625-0.5625-0.5625zm-2.7724-12.208c-0.025746-0.25838-0.14016-0.49987-0.32379-0.68344l-2.6937-2.6933c-0.21973-0.21973-0.57586-0.21973-0.79559 0l-2.693 2.6933c-0.18363 0.18357-0.29804 0.42507-0.32379 0.68344l-1.0853 11.083h9zm-1.7276 7.2584c0 0.225-0.225 0.45-0.45 0.45h-2.475c-0.225 0-0.45-0.225-0.45-0.45v-1.35c0-0.225 0.225-0.45 0.45-0.45h2.475c0.225 0 0.45 0.225 0.45 0.45z" fill="#51585E" opacity=".6"/>
  </g>
 </g>
 </svg>
--- a/data/styles/default/dark/symbols/monument-s.svg
+++ b/data/styles/default/dark/symbols/monument-s.svg
@@ -2,7 +2,7 @@
 <title>monument-s</title>
 <g fill="none" fill-rule="evenodd">
  <g id="monument-s" fill-rule="nonzero">
-   <path id="Shape" d="m12.125 12.5h-8.25c-0.20719 0-0.375 0.16781-0.375 0.375v0.75c1e-7 0.20719 0.16781 0.375 0.375 0.375h8.25c0.20719 0 0.375-0.16781 0.375-0.375v-0.75c0-0.20719-0.16781-0.375-0.375-0.375zm-1.8483-8.1389c-0.017164-0.17225-0.093438-0.33324-0.21586-0.45563l-1.7958-1.7956c-0.14649-0.14648-0.38391-0.14648-0.53039 0l-1.7953 1.7956c-0.12242 0.12238-0.1987 0.28338-0.21586 0.45563l-0.72352 7.3889h6zm-1.1517 4.8389c0 0.15-0.15 0.3-0.3 0.3h-1.65c-0.15 0-0.3-0.15-0.3-0.3v-0.9c0-0.15 0.15-0.3 0.3-0.3h1.65c0.15 0 0.3 0.15 0.3 0.3z" fill="#6E4426"/>
+   <path id="Shape" d="m12.125 12.5h-8.25c-0.20719 0-0.375 0.16781-0.375 0.375v0.75c1e-7 0.20719 0.16781 0.375 0.375 0.375h8.25c0.20719 0 0.375-0.16781 0.375-0.375v-0.75c0-0.20719-0.16781-0.375-0.375-0.375zm-1.8483-8.1389c-0.017164-0.17225-0.093438-0.33324-0.21586-0.45563l-1.7958-1.7956c-0.14649-0.14648-0.38391-0.14648-0.53039 0l-1.7953 1.7956c-0.12242 0.12238-0.1987 0.28338-0.21586 0.45563l-0.72352 7.3889h6zm-1.1517 4.8389c0 0.15-0.15 0.3-0.3 0.3h-1.65c-0.15 0-0.3-0.15-0.3-0.3v-0.9c0-0.15 0.15-0.3 0.3-0.3h1.65c0.15 0 0.3 0.15 0.3 0.3z" fill="#51585E" opacity=".6"/>
  </g>
 </g>
 </svg>
--- a/data/styles/default/dark/symbols/plaque.svg
+++ b/data/styles/default/dark/symbols/plaque.svg
@@ -1,5 +1 @@
-<svg version="1.1" viewBox="0 0 12 10" width="9" height="8" xmlns="http://www.w3.org/2000/svg">
-  <g transform="translate(-6 -7)" fill="none" fill-rule="evenodd">
-    <path d="m7.5 7a1.5 1.5 0 0 0-1.5 1.5v7a1.5 1.5 0 0 0 1.5 1.5h9a1.5 1.5 0 0 0 1.5-1.5v-7a1.5 1.5 0 0 0-1.5-1.5zm0 1a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm0 7a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm9 0a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm0-7a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm-6.5 1h1v1h-1zm2 0h2v1h-2zm-4 2h8v1h-8zm2 2h4v1h-4z" fill="#6E4426"/>
-  </g>
-</svg>
+<svg version="1.1" viewBox="0 0 12 10" width="9" height="8" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><title>cinema-m</title><g transform="translate(-6 -7)" fill="none" fill-rule="evenodd"><g id="cinema-m" fill-rule="nonzero"><path d="m7.5 7a1.5 1.5 0 0 0-1.5 1.5v7a1.5 1.5 0 0 0 1.5 1.5h9a1.5 1.5 0 0 0 1.5-1.5v-7a1.5 1.5 0 0 0-1.5-1.5zm0 1a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm0 7a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm9 0a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm0-7a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm-6.5 1h1v1h-1zm2 0h2v1h-2zm-4 2h8v1h-8zm2 2h4v1h-4z" fill="#51585E" opacity=".6"/></g></g></svg>
--- a/data/styles/default/dark/symbols/remains-m.svg
+++ b/data/styles/default/dark/symbols/remains-m.svg
@@ -2,7 +2,7 @@
 <title>remains-m</title>
 <g fill="none" fill-rule="evenodd">
  <g id="remains-m" fill-rule="nonzero">
-   <path id="Shape" d="m16.846 8.5385h-9.6923c-0.76472 0-1.3846-0.61989-1.3846-1.3846v-3.4615c0-0.38229 0.31002-0.69231 0.69231-0.69231s0.69231 0.31002 0.69231 0.69231v2.0769h1.3846v-1.3846c0-0.76472 0.61989-1.3846 1.3846-1.3846s1.3846 0.61989 1.3846 1.3846v1.3846h1.3846v-1.3846c0-0.76472 0.61989-1.3846 1.3846-1.3846 0.76472 0 1.3846 0.61989 1.3846 1.3846v1.3846h1.3846v-2.0769c0-0.38229 0.31002-0.69231 0.69231-0.69231 0.38229 0 0.69231 0.31002 0.69231 0.69231v3.4615c0 0.76472-0.61989 1.3846-1.3846 1.3846zm3.4615 12.462h-16.615c-0.38229 0-0.69231-0.31002-0.69231-0.69231 0-0.38229 0.31002-0.69231 0.69231-0.69231h0.69231c0.76472 0 1.3846-0.61989 1.3846-1.3846 0 0 1.3846-5.5385 1.3846-6.9231 0-0.76472 0.61989-1.3846 1.3846-1.3846h6.9231c0.76472 0 1.3846 0.61989 1.3846 1.3846 0 1.3846 1.3846 6.9231 1.3846 6.9231 0 0.76472 0.61989 1.3846 1.3846 1.3846h0.69231c0.37703-1.38e-4 0.68483 0.30157 0.69231 0.67846 0 0.39614-0.31002 0.70615-0.69231 0.70615zm-6.2308-4.8462c0-1.147-0.92991-2.0769-2.0769-2.0769s-2.0769 0.92991-2.0769 2.0769v3.4615h4.1538v-4.8462z" fill="#6E4426"/>
+   <path id="Shape" d="m16.846 8.5385h-9.6923c-0.76472 0-1.3846-0.61989-1.3846-1.3846v-3.4615c0-0.38229 0.31002-0.69231 0.69231-0.69231s0.69231 0.31002 0.69231 0.69231v2.0769h1.3846v-1.3846c0-0.76472 0.61989-1.3846 1.3846-1.3846s1.3846 0.61989 1.3846 1.3846v1.3846h1.3846v-1.3846c0-0.76472 0.61989-1.3846 1.3846-1.3846 0.76472 0 1.3846 0.61989 1.3846 1.3846v1.3846h1.3846v-2.0769c0-0.38229 0.31002-0.69231 0.69231-0.69231 0.38229 0 0.69231 0.31002 0.69231 0.69231v3.4615c0 0.76472-0.61989 1.3846-1.3846 1.3846zm3.4615 12.462h-16.615c-0.38229 0-0.69231-0.31002-0.69231-0.69231 0-0.38229 0.31002-0.69231 0.69231-0.69231h0.69231c0.76472 0 1.3846-0.61989 1.3846-1.3846 0 0 1.3846-5.5385 1.3846-6.9231 0-0.76472 0.61989-1.3846 1.3846-1.3846h6.9231c0.76472 0 1.3846 0.61989 1.3846 1.3846 0 1.3846 1.3846 6.9231 1.3846 6.9231 0 0.76472 0.61989 1.3846 1.3846 1.3846h0.69231c0.37703-1.38e-4 0.68483 0.30157 0.69231 0.67846 0 0.39614-0.31002 0.70615-0.69231 0.70615zm-6.2308-4.8462c0-1.147-0.92991-2.0769-2.0769-2.0769s-2.0769 0.92991-2.0769 2.0769v3.4615h4.1538v-4.8462z" fill="#51585E" opacity=".6"/>
  </g>
 </g>
 </svg>
--- a/data/styles/default/dark/symbols/remains-s.svg
+++ b/data/styles/default/dark/symbols/remains-s.svg
@@ -2,7 +2,7 @@
 <title>remains-s</title>
 <g fill="none" fill-rule="evenodd">
  <g id="remains-s" fill-rule="nonzero">
-   <path id="Shape" d="m12.159 2.4993v1.8562c0.01486 0.47771-0.38213 0.87641-0.88664 0.89045h-6.5043c-0.50462 0.0070154-0.91973-0.37475-0.92716-0.85271-9.87e-5 -0.0084-9.87e-5 -0.0168 0-0.0252v-1.8687c0-0.23892 0.20465-0.43268 0.45696-0.43268 0.25233 0 0.45696 0.19376 0.45696 0.43268v0.86537h1.2186v-0.62708c0-0.34627 0.29657-0.62708 0.66227-0.62708 0.3657 0 0.66227 0.28081 0.66227 0.62708v0.62708h1.3245v-0.62708c0-0.34627 0.29657-0.62708 0.66227-0.62708 0.3657 0 0.66227 0.28081 0.66227 0.62708v0.62708h1.3245v-0.86537c-0.04252-0.23202 0.12177-0.45275 0.36677-0.49301 0.24504-0.0402 0.47816 0.1152 0.52067 0.34728 0.0088 0.04824 0.0088 0.09756 1e-6 0.14573zm1.8411 11.062c0 0.24243-0.20756 0.43896-0.46359 0.43896h-11.073c-0.25603-1.24e-4 -0.46345-0.19678-0.46332-0.43921 2.646e-4 -0.2423 0.20755-0.43858 0.46332-0.43871h0.46359c0.49723 0.01404 0.91234-0.35618 0.92718-0.82699 5.292e-4 -0.01692 5.292e-4 -0.03396 0-0.05088 0 0 0.92717-4.0133 0.92717-4.8787-0.00741-0.47094 0.38981-0.85835 0.8873-0.86537 0.00888-1.251e-4 0.017685-1.251e-4 0.026595 0h4.6094c0.49723-0.014039 0.91234 0.35618 0.92717 0.82699 5.32e-4 0.01692 5.32e-4 0.03396 0 0.05088 0 0.87791 0.92718 4.8787 0.92718 4.8787-0.01486 0.47081 0.37616 0.86387 0.8734 0.87791 0.01782 5.05e-4 0.03592 5.05e-4 0.05374 0h0.45035c0.25604 0 0.46359 0.19653 0.46359 0.43896v-0.01248zm-4.7153-2.6714c0-0.69268-0.59299-1.2542-1.3245-1.2542-0.73154 0-1.3245 0.56149-1.3245 1.2542v2.5083h2.6491z" fill="#6E4426"/>
+   <path id="Shape" d="m12.159 2.4993v1.8562c0.01486 0.47771-0.38213 0.87641-0.88664 0.89045h-6.5043c-0.50462 0.0070154-0.91973-0.37475-0.92716-0.85271-9.87e-5 -0.0084-9.87e-5 -0.0168 0-0.0252v-1.8687c0-0.23892 0.20465-0.43268 0.45696-0.43268 0.25233 0 0.45696 0.19376 0.45696 0.43268v0.86537h1.2186v-0.62708c0-0.34627 0.29657-0.62708 0.66227-0.62708 0.3657 0 0.66227 0.28081 0.66227 0.62708v0.62708h1.3245v-0.62708c0-0.34627 0.29657-0.62708 0.66227-0.62708 0.3657 0 0.66227 0.28081 0.66227 0.62708v0.62708h1.3245v-0.86537c-0.04252-0.23202 0.12177-0.45275 0.36677-0.49301 0.24504-0.0402 0.47816 0.1152 0.52067 0.34728 0.0088 0.04824 0.0088 0.09756 1e-6 0.14573zm1.8411 11.062c0 0.24243-0.20756 0.43896-0.46359 0.43896h-11.073c-0.25603-1.24e-4 -0.46345-0.19678-0.46332-0.43921 2.646e-4 -0.2423 0.20755-0.43858 0.46332-0.43871h0.46359c0.49723 0.01404 0.91234-0.35618 0.92718-0.82699 5.292e-4 -0.01692 5.292e-4 -0.03396 0-0.05088 0 0 0.92717-4.0133 0.92717-4.8787-0.00741-0.47094 0.38981-0.85835 0.8873-0.86537 0.00888-1.251e-4 0.017685-1.251e-4 0.026595 0h4.6094c0.49723-0.014039 0.91234 0.35618 0.92717 0.82699 5.32e-4 0.01692 5.32e-4 0.03396 0 0.05088 0 0.87791 0.92718 4.8787 0.92718 4.8787-0.01486 0.47081 0.37616 0.86387 0.8734 0.87791 0.01782 5.05e-4 0.03592 5.05e-4 0.05374 0h0.45035c0.25604 0 0.46359 0.19653 0.46359 0.43896v-0.01248zm-4.7153-2.6714c0-0.69268-0.59299-1.2542-1.3245-1.2542-0.73154 0-1.3245 0.56149-1.3245 1.2542v2.5083h2.6491z" fill="#51585E" opacity=".6"/>
  </g>
 </g>
 </svg>
--- a/data/styles/default/dark/symbols/security-m.svg
+++ b/data/styles/default/dark/symbols/security-m.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#51585E"/>
- <path d="m13.295 7.9993h-8.5898v1.2734c0 2.6488 1.8321 5.1251 4.2949 5.7266 2.4627-0.60136 4.2949-3.0776 4.2949-5.7266zm-4.2949 0.49805 0.73633 1.7363 1.8887 0.16211-1.4316 1.2363 0.42969 1.8516-1.623-0.97656-1.623 0.97656 0.42969-1.8457-1.4316-1.2363 1.8906-0.16211z" fill="#000"/>
- <path d="m11.5 7v-1c0-1.3807-1.1193-2.5-2.5-2.5s-2.5 1.1193-2.5 2.5v1" fill="none" stroke="#000" stroke-width="1.5"/>
-</svg>
--- a/data/styles/default/dark/symbols/statue-m.svg
+++ b/data/styles/default/dark/symbols/statue-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.9987 18h8.0023" stroke="#6E4426" stroke-linecap="round" stroke-width="1.333"/>
- <path d="m9.332 20.666h5.3357" stroke="#6E4426" stroke-linecap="round" stroke-width="1.333"/>
- <path d="m12 2.6666c-0.84966 0-1.5393 0.68968-1.5393 1.5393 0 0.84966 0.68968 1.5364 1.5393 1.5364s1.5393-0.68678 1.5393-1.5364c0-0.84966-0.68968-1.5393-1.5393-1.5393zm-1.5393 4.103c-0.54085 0-1.0243 0.49145-1.0243 1.0243 0 1.0256 1.794 4.121 1.794 5.1302v3.0758h1.5393v-3.0758c0-0.98918 1.794-4.1045 1.794-5.1302 0-0.56757-0.45886-1.0243-1.0243-1.0243z" fill="#6E4426"/>
+ <path d="m7.9987 18h8.0023" stroke="#51585E" opacity=".6" stroke-linecap="round" stroke-width="1.333"/>
+ <path d="m9.332 20.666h5.3357" stroke="#51585E" opacity=".6" stroke-linecap="round" stroke-width="1.333"/>
+ <path d="m12 2.6666c-0.84966 0-1.5393 0.68968-1.5393 1.5393 0 0.84966 0.68968 1.5364 1.5393 1.5364s1.5393-0.68678 1.5393-1.5364c0-0.84966-0.68968-1.5393-1.5393-1.5393zm-1.5393 4.103c-0.54085 0-1.0243 0.49145-1.0243 1.0243 0 1.0256 1.794 4.121 1.794 5.1302v3.0758h1.5393v-3.0758c0-0.98918 1.794-4.1045 1.794-5.1302 0-0.56757-0.45886-1.0243-1.0243-1.0243z" fill="#51585E" opacity=".6"/>
 </svg>
--- a/data/styles/default/dark/symbols/stone-m.svg
+++ b/data/styles/default/dark/symbols/stone-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
 	<title>stone-m</title>
-	<path d="m8.2285 0.27148c-0.7397-0.016388-1.4803 0.063849-2.1953 0.24219-3.2452 1.3467-4.4152 3.3848-4.623 7.4902-0.099199 1.8801-0.77216 3.6862-0.78125 5.5723-0.071978 0.96952 0.32468 2.0383 1.4414 2.1523h11.59c0.84246 0.039747 1.6542-0.60749 1.7188-1.4668 0.002169-4.0249-0.60695-2.9872-0.74219-7.1895-0.096741-1.8809-0.36192-3.9815-1.8379-5.3203-1.3228-0.94308-2.943-1.4444-4.5703-1.4805zm-2.7285 5.1406h1v1h-1v-1zm2 0h3v1h-3v-1zm-4 2.1738h9v1h-9v-1zm2 2h5v1h-5v-1z" fill="#6E4426"/>
+	<path d="m8.2285 0.27148c-0.7397-0.016388-1.4803 0.063849-2.1953 0.24219-3.2452 1.3467-4.4152 3.3848-4.623 7.4902-0.099199 1.8801-0.77216 3.6862-0.78125 5.5723-0.071978 0.96952 0.32468 2.0383 1.4414 2.1523h11.59c0.84246 0.039747 1.6542-0.60749 1.7188-1.4668 0.002169-4.0249-0.60695-2.9872-0.74219-7.1895-0.096741-1.8809-0.36192-3.9815-1.8379-5.3203-1.3228-0.94308-2.943-1.4444-4.5703-1.4805zm-2.7285 5.1406h1v1h-1v-1zm2 0h3v1h-3v-1zm-4 2.1738h9v1h-9v-1zm2 2h5v1h-5v-1z" fill="#51585E" opacity=".6"/>
 </svg>
--- a/data/styles/default/dark/symbols/tank-m.svg
+++ b/data/styles/default/dark/symbols/tank-m.svg
@@ -3,7 +3,7 @@
    <title>tank-m</title>
    <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
        <g id="tank-m" fill-rule="nonzero">
-            <g id="Group" transform="translate(5 7)" fill="#6E4426">
+            <g id="Group" transform="translate(5 7)" fill="#51585E" opacity=".6">
                <path id="Path"
                    d="m11.127 3.8878c-0.1183-0.2366-0.3612-0.3864-0.6265-0.3864h-7.7c-0.3213 0-0.6013 0.2184-0.679 0.5299l-0.3927 1.5701h10.255l-0.8568-1.7136z" />
                <path id="Shape"
--- a/data/styles/default/dark/symbols/tomb-m.svg
+++ b/data/styles/default/dark/symbols/tomb-m.svg
@@ -2,8 +2,8 @@
 <title>tomb-m</title>
 <g transform="matrix(.9375 0 0 .9375 1.25 1.25)" fill="none" fill-rule="evenodd">
  <g id="tomb-m" fill-rule="nonzero">
-   <g id="tomb" transform="translate(6,6)">
-    <path id="Shape" d="m5.6914-2c-2.7471 0-4.9722 2.2277-4.9722 4.9748v5.4931h10.562v-5.4931c0-2.7471-2.2276-4.9748-4.9748-4.9748zm-1.6122 4.2689h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm-4.6179 3.386c-0.25892 0-0.46883 0.20991-0.46883 0.46883v1.2059h14.015v-1.2059c0-0.25892-0.20991-0.46883-0.46883-0.46883zm-0.99235 2.6124c-0.25892 0-0.46883 0.20991-0.46883 0.46882v1.5081h16v-1.5081c0-0.25892-0.20991-0.46882-0.46883-0.46882z" fill="#6E4426" stroke-width=".88889"/>
+   <g id="tomb" transform="translate(6,6)" fill="#777777">
+    <path id="Shape" d="m5.6914-2c-2.7471 0-4.9722 2.2277-4.9722 4.9748v5.4931h10.562v-5.4931c0-2.7471-2.2276-4.9748-4.9748-4.9748zm-1.6122 4.2689h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm-4.6179 3.386c-0.25892 0-0.46883 0.20991-0.46883 0.46883v1.2059h14.015v-1.2059c0-0.25892-0.20991-0.46883-0.46883-0.46883zm-0.99235 2.6124c-0.25892 0-0.46883 0.20991-0.46883 0.46882v1.5081h16v-1.5081c0-0.25892-0.20991-0.46882-0.46883-0.46882z" stroke-width=".88889"/>
   </g>
  </g>
 </g>
--- a/data/styles/default/dark/symbols/viewpoint-m.svg
+++ b/data/styles/default/dark/symbols/viewpoint-m.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
-  <title>viewpoint-m</title>
-  <g id="viewpoint-m" fill-rule="evenodd">
-    <path id="Shape"
-      d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z"
-      fill="#6E4426" />
-  </g>
+    <title>viewpoint-m</title>
+    <g id="viewpoint-m" fill-rule="nonzero" fill="#777777">
+        <path id="Shape"
+            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z" />
+    </g>
+
 </svg>
--- a/data/styles/default/dark/symbols/viewpoint-s.svg
+++ b/data/styles/default/dark/symbols/viewpoint-s.svg
@@ -1,8 +1,9 @@
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
    <title>viewpoint-s</title>
-    <g id="viewpoint-m" fill-rule="evenodd" transform="scale(0.666666)">
+
+    <g id="viewpoint-m" fill-rule="nonzero" transform="scale(0.666666)" fill="#777777">
        <path id="Shape"
-            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z"
-            fill="#6E4426" />
+            d="m9.209 4.6713c-0.98033 0-1.7768 0.69142-1.9437 1.5964-0.43485 0.09882-0.84334 0.36824-1.0965 0.79816l-2.6166 5.3451h0.02492c-0.2168 0.4761-0.34887 0.9964-0.34887 1.548 0 2.1282 1.7945 3.8699 3.987 3.8699 1.7184 0 3.1809-1.0767 3.738-2.5639 0.3173 0.1519 0.6717 0.2418 1.0467 0.2418 0.3749 0 0.7294-0.0899 1.0466-0.2418 0.5571 1.4872 2.0195 2.5639 3.738 2.5639 2.1925 0 3.9871-1.742 3.9871-3.8699 0-0.5516-0.1321-1.0719-0.3488-1.548h0.0249l-2.6166-5.3451c-0.2531-0.42992-0.6616-0.69934-1.0965-0.79816-0.1669-0.90491-0.9634-1.5964-1.9437-1.5964-0.9634 0-1.7578 0.66624-1.9437 1.548h-1.6945c-0.1859-0.88172-0.9804-1.548-1.9437-1.548zm-1.9935 6.9657c1.3307 0 2.3923 1.0304 2.3923 2.3219 0 1.2914-1.0616 2.3218-2.3923 2.3218-1.3307 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm9.5691 0c1.3307 0 2.3922 1.0304 2.3922 2.3219 0 1.2914-1.0615 2.3218-2.3922 2.3218-1.3306 0-2.3923-1.0304-2.3923-2.3218 0-1.2915 1.0616-2.3219 2.3923-2.3219zm-4.7846 0.7739c0.4422 0 0.7974 0.3448 0.7974 0.7741 0 0.4291-0.3552 0.7739-0.7974 0.7739s-0.7974-0.3448-0.7974-0.7739c0-0.4293 0.3552-0.7741 0.7974-0.7741z" />
    </g>
+
 </svg>
--- a/data/styles/default/dark/symbols/wayside_cross-m.svg
+++ b/data/styles/default/dark/symbols/wayside_cross-m.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <path d="m9.8332 7.7888v6.4612h-1.6665v-6.4612h-2.9168v-1.6156h2.9168v-2.4231h1.6665v2.4231h2.9168v1.6156z" fill="#6E4426"/>
+ <path d="m9.8332 7.7888v6.4612h-1.6665v-6.4612h-2.9168v-1.6156h2.9168v-2.4231h1.6665v2.4231h2.9168v1.6156z" fill="#51585E" opacity=".6"/>
 </svg>
--- a/data/styles/default/dark/symbols/wayside_shrine-m.svg
+++ b/data/styles/default/dark/symbols/wayside_shrine-m.svg
@@ -2,7 +2,7 @@
 <title>wayside_shrine-m</title>
 <g fill="none" fill-rule="evenodd">
  <g id="wayside_shrine-m" fill-rule="nonzero">
-   <path id="Shape" d="m11.999 3-7.7137 7.878 1.3299 1.3572 6.385-6.5208 6.3838 6.5208 1.3299-1.3572zm5.2337 10.482v7.518h-2.3496v-4.2c0-1.6572-1.3146-3-2.937-3-1.6224 0-2.937 1.3428-2.937 3v4.2h-2.3496v-7.4316l5.33-5.3232z" fill="#6E4426"/>
+   <path id="Shape" d="m11.999 3-7.7137 7.878 1.3299 1.3572 6.385-6.5208 6.3838 6.5208 1.3299-1.3572zm5.2337 10.482v7.518h-2.3496v-4.2c0-1.6572-1.3146-3-2.937-3-1.6224 0-2.937 1.3428-2.937 3v4.2h-2.3496v-7.4316l5.33-5.3232z" fill="#51585E" opacity=".6"/>
  </g>
 </g>
 </svg>
--- a/data/styles/default/dark/symbols/wreck-m.svg
+++ b/data/styles/default/dark/symbols/wreck-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>wreck-m</title>
-	<path d="m9.0641 2.8396-1.3405 0.56239 1.087 2.5907c-1.1482 0.48083-2.3457 0.98484-2.3457 0.98484l0.56524 1.3435 2.3429-0.98505 2.1682 5.1608c-4.4615 1.8708-8.8093 3.7214-8.5441 3.7214 0.54202 0 1.0606 0.12537 1.521 0.3381 0.44877 0.20108 0.9559 0.31744 1.4804 0.31744 0.52162 0 1.0285-0.11636 1.4802-0.31744 0.4546-0.21273 0.9762-0.3381 1.5182-0.3381 0.54202 0 1.0579 0.12537 1.5242 0.3381 0.44586 0.20108 0.95288 0.31744 1.4745 0.31744 0.52454 0 1.0317-0.11636 1.4804-0.31744 0.46043-0.21273 0.97916-0.3381 1.527-0.3381 0.5391 0 1.0578 0.12537 1.5182 0.3381 0.44877 0.20108 0.95568 0.31744 1.4802 0.31744 0.14862 0 0.28866-0.0291 0.43145-0.04658 0.2681-0.05828 0.53618-0.08451 0.79261-0.18651l0.01736-0.0089c0.47208-2.6605 1.5707-7.9874 1.5707-7.9874s-3.8261 1.5765-7.9292 3.29l-2.168-5.1635 2.1913-0.9209-0.56524-1.3433-1.4688 0.61775s-0.29439 0.12226-0.72276 0.30295zm-6.0657 15.448c-0.54202 0-1.0635 0.12537-1.524 0.33809-0.45169 0.20108-0.95288 0.32052-1.4745 0.32052v2.2146c0.52162 0 1.0228-0.11659 1.4745-0.31766 0.46042-0.21564 0.98191-0.34094 1.524-0.34094 0.54202 0 1.0578 0.1253 1.5182 0.34094 0.45168 0.20108 0.95881 0.31766 1.4804 0.31766 0.52454 0 1.0317-0.11659 1.4804-0.31766 0.4546-0.21564 0.97906-0.34094 1.521-0.34094 0.5391 0 1.0579 0.1253 1.5242 0.34094 0.44295 0.20108 0.94997 0.31766 1.4745 0.31766 0.52449 0 1.0285-0.11659 1.4802-0.31766 0.46042-0.21564 0.97921-0.34094 1.5242-0.34094 0.54201 0 1.0577 0.1253 1.521 0.34094 0.44877 0.20108 0.95595 0.31766 1.4776 0.31766 0.52454 0 1.0256-0.11659 1.4802-0.31766 0.4546-0.21564 0.97927-0.34094 1.5213-0.34094 0.5391 0 1.0577 0.1253 1.524 0.34094 0.44294 0.20108 0.94997 0.31766 1.4745 0.31766v-2.2146c-0.52454 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98483-0.33809-1.524-0.33809-0.54201 0-1.0667 0.12537-1.5213 0.33809-0.4546 0.20108-0.95568 0.32052-1.4802 0.32052-0.52162 0-1.0288-0.11944-1.4776-0.32052-0.46334-0.21273-0.97906-0.33809-1.521-0.33809-0.54493 0-1.0637 0.12537-1.5242 0.33809-0.45169 0.20108-0.95568 0.32052-1.4802 0.32052-0.52451 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98505-0.33809-1.5242-0.33809-0.54202 0-1.0665 0.12537-1.521 0.33809-0.44877 0.20108-0.9559 0.32052-1.4804 0.32052-0.52162 0-1.0287-0.11944-1.4804-0.32052-0.46042-0.21273-0.9762-0.33809-1.5182-0.33809z" fill="#6E4426"/>
+	<path d="m9.0641 2.8396-1.3405 0.56239 1.087 2.5907c-1.1482 0.48083-2.3457 0.98484-2.3457 0.98484l0.56524 1.3435 2.3429-0.98505 2.1682 5.1608c-4.4615 1.8708-8.8093 3.7214-8.5441 3.7214 0.54202 0 1.0606 0.12537 1.521 0.3381 0.44877 0.20108 0.9559 0.31744 1.4804 0.31744 0.52162 0 1.0285-0.11636 1.4802-0.31744 0.4546-0.21273 0.9762-0.3381 1.5182-0.3381 0.54202 0 1.0579 0.12537 1.5242 0.3381 0.44586 0.20108 0.95288 0.31744 1.4745 0.31744 0.52454 0 1.0317-0.11636 1.4804-0.31744 0.46043-0.21273 0.97916-0.3381 1.527-0.3381 0.5391 0 1.0578 0.12537 1.5182 0.3381 0.44877 0.20108 0.95568 0.31744 1.4802 0.31744 0.14862 0 0.28866-0.0291 0.43145-0.04658 0.2681-0.05828 0.53618-0.08451 0.79261-0.18651l0.01736-0.0089c0.47208-2.6605 1.5707-7.9874 1.5707-7.9874s-3.8261 1.5765-7.9292 3.29l-2.168-5.1635 2.1913-0.9209-0.56524-1.3433-1.4688 0.61775s-0.29439 0.12226-0.72276 0.30295zm-6.0657 15.448c-0.54202 0-1.0635 0.12537-1.524 0.33809-0.45169 0.20108-0.95288 0.32052-1.4745 0.32052v2.2146c0.52162 0 1.0228-0.11659 1.4745-0.31766 0.46042-0.21564 0.98191-0.34094 1.524-0.34094 0.54202 0 1.0578 0.1253 1.5182 0.34094 0.45168 0.20108 0.95881 0.31766 1.4804 0.31766 0.52454 0 1.0317-0.11659 1.4804-0.31766 0.4546-0.21564 0.97906-0.34094 1.521-0.34094 0.5391 0 1.0579 0.1253 1.5242 0.34094 0.44295 0.20108 0.94997 0.31766 1.4745 0.31766 0.52449 0 1.0285-0.11659 1.4802-0.31766 0.46042-0.21564 0.97921-0.34094 1.5242-0.34094 0.54201 0 1.0577 0.1253 1.521 0.34094 0.44877 0.20108 0.95595 0.31766 1.4776 0.31766 0.52454 0 1.0256-0.11659 1.4802-0.31766 0.4546-0.21564 0.97927-0.34094 1.5213-0.34094 0.5391 0 1.0577 0.1253 1.524 0.34094 0.44294 0.20108 0.94997 0.31766 1.4745 0.31766v-2.2146c-0.52454 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98483-0.33809-1.524-0.33809-0.54201 0-1.0667 0.12537-1.5213 0.33809-0.4546 0.20108-0.95568 0.32052-1.4802 0.32052-0.52162 0-1.0288-0.11944-1.4776-0.32052-0.46334-0.21273-0.97906-0.33809-1.521-0.33809-0.54493 0-1.0637 0.12537-1.5242 0.33809-0.45169 0.20108-0.95568 0.32052-1.4802 0.32052-0.52451 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98505-0.33809-1.5242-0.33809-0.54202 0-1.0665 0.12537-1.521 0.33809-0.44877 0.20108-0.9559 0.32052-1.4804 0.32052-0.52162 0-1.0287-0.11944-1.4804-0.32052-0.46042-0.21273-0.9762-0.33809-1.5182-0.33809z" fill="#51585E" opacity="0.6"/>
 </svg>
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -814,7 +814,6 @@ node|z17-[amenity=motorcycle_rental],
 node|z17-[amenity=bicycle_rental],
 node|z17-[amenity=bicycle_repair_station],
 node|z17-[amenity=post_office],
-node|z17-[amenity=library],
 node|z18-[post_office=post_partner],
 node|z17-[man_made=works],
 node|z17-[amenity=parcel_locker],
@@ -833,12 +832,11 @@ node|z18-[amenity=toilets],
 node|z18-[amenity=atm],
 node|z18-[amenity=bureau_de_change],
 node|z18-[amenity=money_transfer],
+node|z18-[amenity=library],
 node|z18-[amenity=waste_disposal],
 node|z18-[amenity=recycling],
 node|z18-[amenity=waste_transfer_station],
 node|z18-[amenity=hunting_stand],
-node|z18-[building=guardhouse],
-node|z18-[office=security],
 node|z18-[shop=lottery],
 node|z18-[shop=hearing_aids],
 node|z18-[man_made=chimney],
@@ -1218,7 +1216,6 @@ node|z14-[man_made=communications_tower],
 node|z17-[man_made=communications_tower],
 {font-size: 11;}

-node|z19-[power=portal],
 node|z19-[power=tower],
 node|z15-[man_made=flagpole],
 node|z16-[man_made=mast],
@@ -1291,15 +1288,6 @@ node|z17-[amenity=police],
 node|z18-[amenity=police],
 {font-size: 11;}

-node|z18-[building=guardhouse],
-node|z18-[office=security],
-{icon-image: security-m.svg; font-size: 11;}
-/* Reset captions inherited from [building], leave only main label z18- */
-node|z16-17[building=guardhouse],
-{text: none;}
-node|z16-[building=guardhouse]::int_name,
-{text: none;}
-
 node|z17-[amenity=prison],
 {icon-image: prison-m.svg;}
 node|z18-[amenity=prison],
@@ -1418,12 +1406,12 @@ node|z18-[amenity=bench]
 {icon-image: bench.svg;}
 node|z18-[amenity=waste_basket]
 {icon-image: waste-basket-s.svg;}
+
+node|z18-[amenity=library]
+{icon-image: library-m.svg;font-size: 11;}
 node|z18-[amenity=waste_disposal],
 {icon-image: waste-basket-m.svg;font-size: 11;}

-node|z17-[amenity=library]
-{icon-image: library-m.svg; font-size: 11;}
-
 node|z18-[amenity=internet_cafe]
 {icon-image: internet_cafe-m.svg;}

@@ -2289,8 +2277,6 @@ node[sport=yoga],
 node[amenity=car_rental],
 node[amenity=car_sharing],
 node[amenity=fire_station],
-node[building=guardhouse],
-node[office=security],
 {text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}

 node[amenity=bicycle_rental],
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -398,7 +398,6 @@ railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (al

 building                                            # area z14- (also has caption z16-)
 building-garage                                     # area z14- (also has caption z16-)
-building-guardhouse                                 # area z14- (also has icon z18-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z16-)
 building-train_station                              # area z14- (also has caption z16-)
 === 130
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -755,7 +755,7 @@ tourism-hotel                                       # icon z16- (also has captio

 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
 amenity-bank                                        # icon z16- (also has caption(optional) z16-)
-amenity-library                                     # icon z17- (also has caption(optional) z17-)
+amenity-library                                     # icon z18- (also has caption(optional) z18-)
 amenity-marketplace                                 # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-pharmacy                                    # icon z16- (also has caption(optional) z17-)
 shop-convenience                                    # icon z16- (also has caption(optional) z16-)
@@ -1186,7 +1186,6 @@ amenity-shower                                      # icon z17- (also has captio
 amenity-toilets                                     # icon z18- (also has caption(optional) z18-)
 man_made-embankment                                 # pathtext z18- (also has line z16-)
 office                                              # icon z18- (also has caption(optional) z18-)
-office-security                                     # icon z18- (also has caption(optional) z18-)
 post_office-post_partner                            # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
@@ -1201,7 +1200,6 @@ man_made-mast                                       # icon z16-
 man_made-silo                                       # icon z16- (also has caption(optional) z18-)
 man_made-storage_tank                               # icon z16- (also has caption(optional) z18-)
 man_made-water_tower                                # icon z16- (also has caption(optional) z18-)
-power-portal                                        # icon z19-
 power-tower                                         # icon z19-
 === 450

@@ -1225,7 +1223,6 @@ emergency-emergency_ward_entrance                   # icon z16- (also has captio

 building                                            # caption z16- (also has area z14-)
 building-garage                                     # caption z16- (also has area z14-)
-building-guardhouse                                 # icon z18- (also has caption(optional) z18-, area z14-)
 building-has_parts                                  # caption z16- (also has area z14-)
 power-plant                                         # icon z17- (also has area z13-)
 power-plant-coal                                    # icon z17- (also has area z13-)
@@ -1746,7 +1743,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio

 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
 # amenity-bank                                      # caption(optional) z16- (also has icon z16-)
-# amenity-library                                   # caption(optional) z17- (also has icon z17-)
+# amenity-library                                   # caption(optional) z18- (also has icon z18-)
 # amenity-marketplace                               # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-pharmacy                                  # caption(optional) z17- (also has icon z16-)
 # shop-convenience                                  # caption(optional) z16- (also has icon z16-)
@@ -2128,7 +2125,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shower                                    # caption(optional) z17- (also has icon z17-)
 # amenity-toilets                                   # caption(optional) z18- (also has icon z18-)
 # office                                            # caption(optional) z18- (also has icon z18-)
-# office-security                                   # caption(optional) z18- (also has icon z18-)
 # post_office-post_partner                          # caption(optional) z18- (also has icon z18-)
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
@@ -2161,7 +2157,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z16-)
 # === -9750

-# building-guardhouse                               # caption(optional) z18- (also has icon z18-, area z14-)
 # power-plant-wind                                  # caption(optional) z16- (also has icon z15-, area z13-)
 # === -9770

--- a/data/styles/default/light/symbols/aircraft-m.svg
+++ b/data/styles/default/light/symbols/aircraft-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 <title>aircraft-m</title>
- <path fill="#9C6136" d="m19 15.1v-1.3l-5.4737-3.25v-3.575c0-0.5395-0.45842-0.975-1.0263-0.975s-1.0263 0.4355-1.0263 0.975v3.575l-5.4737 3.25v1.3l5.4737-1.625v3.575l-1.3684 0.975v0.975l2.3947-0.65 2.3947 0.65v-0.975l-1.3684-0.975v-3.575l5.4737 1.625z"/>
+ <path fill="#9C6136" opacity="1" d="m19 15.1v-1.3l-5.4737-3.25v-3.575c0-0.5395-0.45842-0.975-1.0263-0.975s-1.0263 0.4355-1.0263 0.975v3.575l-5.4737 3.25v1.3l5.4737-1.625v3.575l-1.3684 0.975v0.975l2.3947-0.65 2.3947 0.65v-0.975l-1.3684-0.975v-3.575l5.4737 1.625z"/>
 </svg>
--- a/data/styles/default/light/symbols/archaeological-site-m.svg
+++ b/data/styles/default/light/symbols/archaeological-site-m.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 <title>wayside_shrine-m</title>
 <g transform="matrix(1.1429 0 0 1.1429 2.8815 2.8583)">
-  <path id="archaeological-site" d="m3.4787 0.12402v1.125h1.125c0.67373 0 0.94628 1.1735 1.0547 2.1445-1.0938-0.85089-2.1516-1.155-3.0586-0.98438-1.1591 0.21803-1.9336 1.2859-1.9336 2.4961 0 0.94716 0.35113 1.7762 0.94922 2.6367 0.5227 0.75204 1.2598 1.6201 2.1797 2.6719 0.41226 1.5289 1.1712 2.929 1.9336 3.6914v0.84375l-1.125 0.5625v0.5625h6.75v-0.5625l-1.125-0.5625v-0.84375c0.76241-0.76241 1.5213-2.1625 1.9336-3.6914 0.91986-1.0518 1.657-1.9198 2.1797-2.6719 0.59809-0.86051 0.94922-1.6896 0.94922-2.6367 0-1.2102-0.7745-2.2781-1.9336-2.4961-0.90701-0.17061-1.9648 0.13348-3.0586 0.98438 0.1084-0.97108 0.38096-2.1445 1.0547-2.1445h1.125v-1.125zm-0.70312 3.4102c0.57357-0.10789 1.5305 0.1139 2.6367 1.125-1.2544 0.15568-1.9336 1.2581-1.9336 3.3398 0 0.035096-5.431e-4 0.070242 0 0.10547-0.38309-0.4451-0.70179-0.83932-0.94922-1.1953-0.52691-0.7581-0.73828-1.3145-0.73828-2.0039 0-0.78786 0.34979-1.2517 0.98438-1.3711zm9.8438 0c0.21162-0.030504 0.40385-0.029842 0.5625 0 0.63458 0.11937 0.98437 0.58323 0.98437 1.3711 0 0.68937-0.21137 1.2458-0.73828 2.0039-0.24743 0.35599-0.56613 0.75021-0.94922 1.1953 5.44e-4 -0.035226 0-0.070374 0-0.10547 0-2.0817-0.67921-3.1842-1.9336-3.3398 0.80028-0.73143 1.5207-1.0452 2.0742-1.125z" fill="#9C6136"/>
+  <path id="archaeological-site" d="m3.4787 0.12402v1.125h1.125c0.67373 0 0.94628 1.1735 1.0547 2.1445-1.0938-0.85089-2.1516-1.155-3.0586-0.98438-1.1591 0.21803-1.9336 1.2859-1.9336 2.4961 0 0.94716 0.35113 1.7762 0.94922 2.6367 0.5227 0.75204 1.2598 1.6201 2.1797 2.6719 0.41226 1.5289 1.1712 2.929 1.9336 3.6914v0.84375l-1.125 0.5625v0.5625h6.75v-0.5625l-1.125-0.5625v-0.84375c0.76241-0.76241 1.5213-2.1625 1.9336-3.6914 0.91986-1.0518 1.657-1.9198 2.1797-2.6719 0.59809-0.86051 0.94922-1.6896 0.94922-2.6367 0-1.2102-0.7745-2.2781-1.9336-2.4961-0.90701-0.17061-1.9648 0.13348-3.0586 0.98438 0.1084-0.97108 0.38096-2.1445 1.0547-2.1445h1.125v-1.125zm-0.70312 3.4102c0.57357-0.10789 1.5305 0.1139 2.6367 1.125-1.2544 0.15568-1.9336 1.2581-1.9336 3.3398 0 0.035096-5.431e-4 0.070242 0 0.10547-0.38309-0.4451-0.70179-0.83932-0.94922-1.1953-0.52691-0.7581-0.73828-1.3145-0.73828-2.0039 0-0.78786 0.34979-1.2517 0.98438-1.3711zm9.8438 0c0.21162-0.030504 0.40385-0.029842 0.5625 0 0.63458 0.11937 0.98437 0.58323 0.98437 1.3711 0 0.68937-0.21137 1.2458-0.73828 2.0039-0.24743 0.35599-0.56613 0.75021-0.94922 1.1953 5.44e-4 -0.035226 0-0.070374 0-0.10547 0-2.0817-0.67921-3.1842-1.9336-3.3398 0.80028-0.73143 1.5207-1.0452 2.0742-1.125z" fill="#9C6136" stroke-width="1.125"/>
 </g>
 </svg>
--- a/data/styles/default/light/symbols/locomotive-m.svg
+++ b/data/styles/default/light/symbols/locomotive-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>locomotive-m</title>
-	<path d="m13.789 8.0953h5.6461v7.5849h-0.99317q-0.19047-0.67345-0.75508-1.1156-0.56461-0.44216-1.2857-0.44216-0.63264 0-1.1768 0.36054-0.5442 0.36053-0.7959 0.99317h0.13605q0.21769-0.5238 0.71427-0.87073 0.49658-0.34694 1.1224-0.34694 0.72787 0 1.2857 0.47618 0.55781 0.47618 0.66665 1.1905h1.0816v1.1768h-1.2449q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.58502 0-1.0646-0.30612-0.47958-0.30612-0.73128-0.82311h-0.38774q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.57822 0-1.0578-0.30952-0.47957-0.30952-0.73126-0.8197h-0.40816q-0.09528 0.48298-0.48298 0.8061-0.38775 0.32312-0.89114 0.32312-0.50339 0-0.89114-0.31972-0.38774-0.31972-0.48299-0.8095h-0.027208v1.0952h-3.6666v-0.76188h0.51019l1.1836-1.7551h0.36734q0.32653-0.2381 0.54421-0.88773 0.21767-0.64965 0.21767-1.5204 0-0.82311-0.21087-1.483-0.21089-0.65985-0.55102-0.92515h0.60543l-1.0272-3.3196h3.9183l-1.0204 3.3196q0.38094 0.35373 0.59182 0.95576 0.21088 0.60202 0.21088 1.4387 0 0.72787-0.16326 1.2959-0.16326 0.56801-0.44216 0.91494l0.16326-0.02721q0.081624-0.01365 0.17006-0.01365h0.013654q0.23809-0.33332 0.38094-0.89454 0.14286-0.56121 0.14286-1.2551 0-0.87073-0.21768-1.5204-0.21768-0.64965-0.5442-0.88773h0.70066v-0.81631q0-0.2721 0.23129-0.45917 0.23129-0.18707 0.5374-0.18707 0.31292 0 0.5442 0.18707 0.23129 0.18707 0.23129 0.45917v0.81631h0.39454v-1.2925q0-0.2585 0.23129-0.44557 0.23129-0.18706 0.5374-0.18706 0.34013 0 0.55441 0.19387 0.21428 0.19387 0.21428 0.43876v1.2925h0.97957t0-2.7754zm2.6258 3.8162q0 0.15646 0.10544 0.2585 0.10544 0.10204 0.2551 0.10204h1.6122q0.15646 0 0.2585-0.10204 0.10204-0.10204 0.10204-0.2585v-2.7822q0-0.14966-0.10204-0.2551-0.10204-0.10544-0.2585-0.10544h-1.6122q-0.14965 0-0.2551 0.10544-0.10544 0.10544-0.10544 0.2551 0 0 0 2.7822zm3.7958-4.9727v0.89113h-7.1903v-0.89113h7.1903zm-14.728 4.0611q0.31973 0 0.58843 0.67006 0.26871 0.67005 0.26871 1.602 0 0.94555-0.26871 1.6122-0.2687 0.66665-0.58843 0.66665-0.31972 0-0.58843-0.66665-0.2687-0.66666-0.2687-1.6122 0-0.93195 0.2687-1.602 0.26871-0.67006 0.58843-0.67006zm8.1699 5.3536h-0.7823q-0.13605 0-0.23468-0.09859-0.09864-0.09869-0.09864-0.23469 0-0.13605 0.09864-0.23128 0.09863-0.09528 0.23468-0.09528h0.65305q-0.15646-0.30612-0.44217-0.49319-0.28571-0.18707-0.65305-0.18707-0.51019 0-0.87073 0.36393-0.36053 0.36394-0.36053 0.86733 0 0.51018 0.36053 0.87073 0.36054 0.36053 0.87073 0.36053 0.46938 0 0.82651-0.32652 0.35714-0.32653 0.39795-0.7959zm1.6598-0.65985h0.84352q0.13605 0 0.23129 0.09528 0.09524 0.09528 0.09524 0.23128 0 0.13605-0.09524 0.23469-0.09524 0.09859-0.23129 0.09859h-0.97277q0.04081 0.48298 0.39794 0.8027 0.35714 0.31972 0.82651 0.31972 0.51019 0 0.86733-0.36393 0.35713-0.36393 0.35713-0.86732 0-0.50339-0.35713-0.86733-0.35714-0.36393-0.86733-0.36393-0.36734 0-0.65304 0.18707-0.28571 0.18707-0.44217 0.49319zm-6.0203-9.0202h-3.8162l0.38776-0.90474h3.0271s0.40134 0.90474 0.40134 0.90474zm-4.1632 0.2653h4.5237v0.34012h-4.5237v-0.34012zm9.2719 8.5372q-0.24488-0.61904-0.78909-0.98638-0.54421-0.36734-1.1836-0.36734-0.73468 0-1.2993 0.44897-0.56461 0.44897-0.74147 1.1088h-0.73468q0.0748 0.05442 0.13945 0.11224 0.06466 0.05783 0.12584 0.13266h0.55102q0.12244-0.72107 0.67345-1.1938 0.551-0.47279 1.2857-0.47279 0.60543 0 1.0986 0.33333 0.49319 0.33332 0.73128 0.88433 0 0 0.14285 0zm-6.6053 0.44897q0.10884-0.13605 0.2585-0.24489h-0.59863v0.24489t0.34013 0z" fill="#9C6136"/>
+	<path d="m13.789 8.0953h5.6461v7.5849h-0.99317q-0.19047-0.67345-0.75508-1.1156-0.56461-0.44216-1.2857-0.44216-0.63264 0-1.1768 0.36054-0.5442 0.36053-0.7959 0.99317h0.13605q0.21769-0.5238 0.71427-0.87073 0.49658-0.34694 1.1224-0.34694 0.72787 0 1.2857 0.47618 0.55781 0.47618 0.66665 1.1905h1.0816v1.1768h-1.2449q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.58502 0-1.0646-0.30612-0.47958-0.30612-0.73128-0.82311h-0.38774q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.57822 0-1.0578-0.30952-0.47957-0.30952-0.73126-0.8197h-0.40816q-0.09528 0.48298-0.48298 0.8061-0.38775 0.32312-0.89114 0.32312-0.50339 0-0.89114-0.31972-0.38774-0.31972-0.48299-0.8095h-0.027208v1.0952h-3.6666v-0.76188h0.51019l1.1836-1.7551h0.36734q0.32653-0.2381 0.54421-0.88773 0.21767-0.64965 0.21767-1.5204 0-0.82311-0.21087-1.483-0.21089-0.65985-0.55102-0.92515h0.60543l-1.0272-3.3196h3.9183l-1.0204 3.3196q0.38094 0.35373 0.59182 0.95576 0.21088 0.60202 0.21088 1.4387 0 0.72787-0.16326 1.2959-0.16326 0.56801-0.44216 0.91494l0.16326-0.02721q0.081624-0.01365 0.17006-0.01365h0.013654q0.23809-0.33332 0.38094-0.89454 0.14286-0.56121 0.14286-1.2551 0-0.87073-0.21768-1.5204-0.21768-0.64965-0.5442-0.88773h0.70066v-0.81631q0-0.2721 0.23129-0.45917 0.23129-0.18707 0.5374-0.18707 0.31292 0 0.5442 0.18707 0.23129 0.18707 0.23129 0.45917v0.81631h0.39454v-1.2925q0-0.2585 0.23129-0.44557 0.23129-0.18706 0.5374-0.18706 0.34013 0 0.55441 0.19387 0.21428 0.19387 0.21428 0.43876v1.2925h0.97957t0-2.7754zm2.6258 3.8162q0 0.15646 0.10544 0.2585 0.10544 0.10204 0.2551 0.10204h1.6122q0.15646 0 0.2585-0.10204 0.10204-0.10204 0.10204-0.2585v-2.7822q0-0.14966-0.10204-0.2551-0.10204-0.10544-0.2585-0.10544h-1.6122q-0.14965 0-0.2551 0.10544-0.10544 0.10544-0.10544 0.2551 0 0 0 2.7822zm3.7958-4.9727v0.89113h-7.1903v-0.89113h7.1903zm-14.728 4.0611q0.31973 0 0.58843 0.67006 0.26871 0.67005 0.26871 1.602 0 0.94555-0.26871 1.6122-0.2687 0.66665-0.58843 0.66665-0.31972 0-0.58843-0.66665-0.2687-0.66666-0.2687-1.6122 0-0.93195 0.2687-1.602 0.26871-0.67006 0.58843-0.67006zm8.1699 5.3536h-0.7823q-0.13605 0-0.23468-0.09859-0.09864-0.09869-0.09864-0.23469 0-0.13605 0.09864-0.23128 0.09863-0.09528 0.23468-0.09528h0.65305q-0.15646-0.30612-0.44217-0.49319-0.28571-0.18707-0.65305-0.18707-0.51019 0-0.87073 0.36393-0.36053 0.36394-0.36053 0.86733 0 0.51018 0.36053 0.87073 0.36054 0.36053 0.87073 0.36053 0.46938 0 0.82651-0.32652 0.35714-0.32653 0.39795-0.7959zm1.6598-0.65985h0.84352q0.13605 0 0.23129 0.09528 0.09524 0.09528 0.09524 0.23128 0 0.13605-0.09524 0.23469-0.09524 0.09859-0.23129 0.09859h-0.97277q0.04081 0.48298 0.39794 0.8027 0.35714 0.31972 0.82651 0.31972 0.51019 0 0.86733-0.36393 0.35713-0.36393 0.35713-0.86732 0-0.50339-0.35713-0.86733-0.35714-0.36393-0.86733-0.36393-0.36734 0-0.65304 0.18707-0.28571 0.18707-0.44217 0.49319zm-6.0203-9.0202h-3.8162l0.38776-0.90474h3.0271s0.40134 0.90474 0.40134 0.90474zm-4.1632 0.2653h4.5237v0.34012h-4.5237v-0.34012zm9.2719 8.5372q-0.24488-0.61904-0.78909-0.98638-0.54421-0.36734-1.1836-0.36734-0.73468 0-1.2993 0.44897-0.56461 0.44897-0.74147 1.1088h-0.73468q0.0748 0.05442 0.13945 0.11224 0.06466 0.05783 0.12584 0.13266h0.55102q0.12244-0.72107 0.67345-1.1938 0.551-0.47279 1.2857-0.47279 0.60543 0 1.0986 0.33333 0.49319 0.33332 0.73128 0.88433 0 0 0.14285 0zm-6.6053 0.44897q0.10884-0.13605 0.2585-0.24489h-0.59863v0.24489t0.34013 0z" fill="#9C6136" stroke-width=".0068026"/>
 </svg>
--- a/data/styles/default/light/symbols/security-m.svg
+++ b/data/styles/default/light/symbols/security-m.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#747E86"/>
- <path d="m13.295 7.9993h-8.5898v1.2734c0 2.6488 1.8321 5.1251 4.2949 5.7266 2.4627-0.60136 4.2949-3.0776 4.2949-5.7266zm-4.2949 0.49805 0.73633 1.7363 1.8887 0.16211-1.4316 1.2363 0.42969 1.8516-1.623-0.97656-1.623 0.97656 0.42969-1.8457-1.4316-1.2363 1.8906-0.16211z" fill="#fff"/>
- <path d="m11.5 7v-1c0-1.3807-1.1193-2.5-2.5-2.5s-2.5 1.1193-2.5 2.5v1" fill="none" stroke="#fff" stroke-width="1.5"/>
-</svg>
--- a/data/styles/default/light/symbols/tank-m.svg
+++ b/data/styles/default/light/symbols/tank-m.svg
@@ -3,7 +3,7 @@
    <title>tank-m</title>
    <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
        <g id="tank-m" fill-rule="nonzero">
-            <g id="Group" transform="translate(5 7)" fill="#9C6136">
+            <g id="Group" transform="translate(5 7)" fill="#9C6136" opacity="1">
                <path id="Path"
                    d="m11.127 3.8878c-0.1183-0.2366-0.3612-0.3864-0.6265-0.3864h-7.7c-0.3213 0-0.6013 0.2184-0.679 0.5299l-0.3927 1.5701h10.255l-0.8568-1.7136z" />
                <path id="Shape"
--- a/data/styles/default/light/symbols/tomb-m.svg
+++ b/data/styles/default/light/symbols/tomb-m.svg
@@ -2,7 +2,7 @@
 <title>tomb-m</title>
 <g transform="matrix(.9375 0 0 .9375 1.25 1.25)" fill="none" fill-rule="evenodd">
  <g id="tomb-m" fill-rule="nonzero">
-   <g id="tomb" transform="translate(6,6)">
+   <g id="tomb" transform="translate(6,6)" fill="#fff">
    <path id="Shape" d="m5.6914-2c-2.7471 0-4.9722 2.2277-4.9722 4.9748v5.4931h10.562v-5.4931c0-2.7471-2.2276-4.9748-4.9748-4.9748zm-1.6122 4.2689h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm0 1.8753h3.8418c0.25892 0 0.46883 0.20991 0.46883 0.46883 0 0.25892-0.20988 0.46883-0.46883 0.46883h-3.8418c-0.25892 0-0.46883-0.20991-0.46883-0.46883 0-0.25892 0.20991-0.46883 0.46883-0.46883zm-4.6179 3.386c-0.25892 0-0.46883 0.20991-0.46883 0.46883v1.2059h14.015v-1.2059c0-0.25892-0.20991-0.46883-0.46883-0.46883zm-0.99235 2.6124c-0.25892 0-0.46883 0.20991-0.46883 0.46882v1.5081h16v-1.5081c0-0.25892-0.20991-0.46882-0.46883-0.46882z" fill="#9C6136" stroke-width=".88889"/>
   </g>
  </g>
--- a/data/styles/default/light/symbols/wreck-m.svg
+++ b/data/styles/default/light/symbols/wreck-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>wreck-m</title>
-	<path d="m9.0641 2.8396-1.3405 0.56239 1.087 2.5907c-1.1482 0.48083-2.3457 0.98484-2.3457 0.98484l0.56524 1.3435 2.3429-0.98505 2.1682 5.1608c-4.4615 1.8708-8.8093 3.7214-8.5441 3.7214 0.54202 0 1.0606 0.12537 1.521 0.3381 0.44877 0.20108 0.9559 0.31744 1.4804 0.31744 0.52162 0 1.0285-0.11636 1.4802-0.31744 0.4546-0.21273 0.9762-0.3381 1.5182-0.3381 0.54202 0 1.0579 0.12537 1.5242 0.3381 0.44586 0.20108 0.95288 0.31744 1.4745 0.31744 0.52454 0 1.0317-0.11636 1.4804-0.31744 0.46043-0.21273 0.97916-0.3381 1.527-0.3381 0.5391 0 1.0578 0.12537 1.5182 0.3381 0.44877 0.20108 0.95568 0.31744 1.4802 0.31744 0.14862 0 0.28866-0.0291 0.43145-0.04658 0.2681-0.05828 0.53618-0.08451 0.79261-0.18651l0.01736-0.0089c0.47208-2.6605 1.5707-7.9874 1.5707-7.9874s-3.8261 1.5765-7.9292 3.29l-2.168-5.1635 2.1913-0.9209-0.56524-1.3433-1.4688 0.61775s-0.29439 0.12226-0.72276 0.30295zm-6.0657 15.448c-0.54202 0-1.0635 0.12537-1.524 0.33809-0.45169 0.20108-0.95288 0.32052-1.4745 0.32052v2.2146c0.52162 0 1.0228-0.11659 1.4745-0.31766 0.46042-0.21564 0.98191-0.34094 1.524-0.34094 0.54202 0 1.0578 0.1253 1.5182 0.34094 0.45168 0.20108 0.95881 0.31766 1.4804 0.31766 0.52454 0 1.0317-0.11659 1.4804-0.31766 0.4546-0.21564 0.97906-0.34094 1.521-0.34094 0.5391 0 1.0579 0.1253 1.5242 0.34094 0.44295 0.20108 0.94997 0.31766 1.4745 0.31766 0.52449 0 1.0285-0.11659 1.4802-0.31766 0.46042-0.21564 0.97921-0.34094 1.5242-0.34094 0.54201 0 1.0577 0.1253 1.521 0.34094 0.44877 0.20108 0.95595 0.31766 1.4776 0.31766 0.52454 0 1.0256-0.11659 1.4802-0.31766 0.4546-0.21564 0.97927-0.34094 1.5213-0.34094 0.5391 0 1.0577 0.1253 1.524 0.34094 0.44294 0.20108 0.94997 0.31766 1.4745 0.31766v-2.2146c-0.52454 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98483-0.33809-1.524-0.33809-0.54201 0-1.0667 0.12537-1.5213 0.33809-0.4546 0.20108-0.95568 0.32052-1.4802 0.32052-0.52162 0-1.0288-0.11944-1.4776-0.32052-0.46334-0.21273-0.97906-0.33809-1.521-0.33809-0.54493 0-1.0637 0.12537-1.5242 0.33809-0.45169 0.20108-0.95568 0.32052-1.4802 0.32052-0.52451 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98505-0.33809-1.5242-0.33809-0.54202 0-1.0665 0.12537-1.521 0.33809-0.44877 0.20108-0.9559 0.32052-1.4804 0.32052-0.52162 0-1.0287-0.11944-1.4804-0.32052-0.46042-0.21273-0.9762-0.33809-1.5182-0.33809z" fill="#9C6136"/>
+	<path d="m9.0641 2.8396-1.3405 0.56239 1.087 2.5907c-1.1482 0.48083-2.3457 0.98484-2.3457 0.98484l0.56524 1.3435 2.3429-0.98505 2.1682 5.1608c-4.4615 1.8708-8.8093 3.7214-8.5441 3.7214 0.54202 0 1.0606 0.12537 1.521 0.3381 0.44877 0.20108 0.9559 0.31744 1.4804 0.31744 0.52162 0 1.0285-0.11636 1.4802-0.31744 0.4546-0.21273 0.9762-0.3381 1.5182-0.3381 0.54202 0 1.0579 0.12537 1.5242 0.3381 0.44586 0.20108 0.95288 0.31744 1.4745 0.31744 0.52454 0 1.0317-0.11636 1.4804-0.31744 0.46043-0.21273 0.97916-0.3381 1.527-0.3381 0.5391 0 1.0578 0.12537 1.5182 0.3381 0.44877 0.20108 0.95568 0.31744 1.4802 0.31744 0.14862 0 0.28866-0.0291 0.43145-0.04658 0.2681-0.05828 0.53618-0.08451 0.79261-0.18651l0.01736-0.0089c0.47208-2.6605 1.5707-7.9874 1.5707-7.9874s-3.8261 1.5765-7.9292 3.29l-2.168-5.1635 2.1913-0.9209-0.56524-1.3433-1.4688 0.61775s-0.29439 0.12226-0.72276 0.30295zm-6.0657 15.448c-0.54202 0-1.0635 0.12537-1.524 0.33809-0.45169 0.20108-0.95288 0.32052-1.4745 0.32052v2.2146c0.52162 0 1.0228-0.11659 1.4745-0.31766 0.46042-0.21564 0.98191-0.34094 1.524-0.34094 0.54202 0 1.0578 0.1253 1.5182 0.34094 0.45168 0.20108 0.95881 0.31766 1.4804 0.31766 0.52454 0 1.0317-0.11659 1.4804-0.31766 0.4546-0.21564 0.97906-0.34094 1.521-0.34094 0.5391 0 1.0579 0.1253 1.5242 0.34094 0.44295 0.20108 0.94997 0.31766 1.4745 0.31766 0.52449 0 1.0285-0.11659 1.4802-0.31766 0.46042-0.21564 0.97921-0.34094 1.5242-0.34094 0.54201 0 1.0577 0.1253 1.521 0.34094 0.44877 0.20108 0.95595 0.31766 1.4776 0.31766 0.52454 0 1.0256-0.11659 1.4802-0.31766 0.4546-0.21564 0.97927-0.34094 1.5213-0.34094 0.5391 0 1.0577 0.1253 1.524 0.34094 0.44294 0.20108 0.94997 0.31766 1.4745 0.31766v-2.2146c-0.52454 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98483-0.33809-1.524-0.33809-0.54201 0-1.0667 0.12537-1.5213 0.33809-0.4546 0.20108-0.95568 0.32052-1.4802 0.32052-0.52162 0-1.0288-0.11944-1.4776-0.32052-0.46334-0.21273-0.97906-0.33809-1.521-0.33809-0.54493 0-1.0637 0.12537-1.5242 0.33809-0.45169 0.20108-0.95568 0.32052-1.4802 0.32052-0.52451 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98505-0.33809-1.5242-0.33809-0.54202 0-1.0665 0.12537-1.521 0.33809-0.44877 0.20108-0.9559 0.32052-1.4804 0.32052-0.52162 0-1.0287-0.11944-1.4804-0.32052-0.46042-0.21273-0.9762-0.33809-1.5182-0.33809z" fill="#9C6136" stroke-width=".11248"/>
 </svg>
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -284,20 +284,14 @@ node|z12-[barrier=border_control],
 node|z14-[barrier=border_control],
 {icon-image: bcontrol-m.svg;}

-node|z16-[building=guardhouse],
-node|z17-[office=security],
-{icon-image: security-m.svg;}
-
 node|z14-[highway=ford],
 {icon-image: ford-m.svg;}

 node|z16-[highway=ladder],
 {icon-image: ladder-m.svg;}

-node|z13-[power=portal],
 node|z13[power=tower],
 {icon-image: mast-m.svg;}
-node|z14-[power=portal],
 node|z14-[power=tower],
 {icon-image: power-tower-m.svg;}
 node|z15-[power=pole],
@@ -329,11 +323,14 @@ node|z14-[man_made=communications_tower],
 node|z16-[man_made=communications_tower],
 {font-size: 12;}

-node|z13-[man_made=tower],
+node|z14-[man_made=tower],
+node|z14-[man_made=tower][tower:type=communication],
 node|z13-[man_made=flare],
 {icon-image: mast-m.svg; font-size: 11;}

-node|z14-[man_made=tower][tower:type!=communication],
+node|z13-[man_made=tower],
+{icon-image: mast-m.svg; font-size: 11;}
+node|z14-[man_made=tower],
 {icon-image: storage-tank.svg;}
 node|z16-[man_made=tower],
 {font-size: 12;}
--- a/data/styles/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -238,12 +238,8 @@ line|z17[highway=path][_path_grade=expert],
 line|z18-[highway=path][_path_grade=expert],
 {width: 4; dashes: 3.5,11;}

-/*
-Don't display sidewalks till z13 (like highway=service).
-"Rožňava" foot routes are very common with highway-footway-sidewalk
-*/
-line|z11-12[highway=footway][footway=sidewalk],
-/* Don't display pedestrian crossings till z16. */
+/* Don't display sidewalks and pedestrian crossings till z16. */
+line|z11-15[highway=footway][footway=sidewalk],
 line|z11-15[highway=footway][footway=crossing],
 {width: 0;}

--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -305,7 +305,7 @@ railway-preserved-tunnel                            # line z13-
 === 160

 highway-footway-bridge                              # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
-highway-footway-sidewalk                            # line z13-
+highway-footway-sidewalk                            # line z16-
 highway-footway-tunnel                              # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
 highway-path-bridge                                 # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-path-horse                                  # line z11- (also has pathtext z13-)
@@ -400,7 +400,6 @@ railway-subway-bridge::bridgeblack                  # line::bridgeblack z16- (al

 building                                            # area z14- (also has caption z16-)
 building-garage                                     # area z14- (also has caption z16-)
-building-guardhouse                                 # area z14- (also has icon z16-, caption(optional) z18-)
 building-has_parts                                  # area z14- (also has caption z16-)
 building-train_station                              # area z14- (also has caption z16-)
 === 130
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -755,7 +755,7 @@ tourism-hotel                                       # icon z16- (also has captio

 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
 amenity-bank                                        # icon z16- (also has caption(optional) z16-)
-amenity-library                                     # icon z17- (also has caption(optional) z17-)
+amenity-library                                     # icon z18- (also has caption(optional) z18-)
 amenity-marketplace                                 # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-pharmacy                                    # icon z16- (also has caption(optional) z17-)
 shop-convenience                                    # icon z16- (also has caption(optional) z16-)
@@ -1187,7 +1187,6 @@ amenity-shower                                      # icon z17- (also has captio
 amenity-toilets                                     # icon z15- (also has caption(optional) z18-)
 man_made-embankment                                 # pathtext z18- (also has line z16-)
 office                                              # icon z18- (also has caption(optional) z18-)
-office-security                                     # icon z17- (also has caption(optional) z18-)
 post_office-post_partner                            # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
@@ -1202,7 +1201,6 @@ man_made-mast                                       # icon z13- (also has captio
 man_made-silo                                       # icon z13- (also has caption(optional) z14-)
 man_made-storage_tank                               # icon z13- (also has caption(optional) z14-)
 man_made-water_tower                                # icon z13- (also has caption(optional) z14-)
-power-portal                                        # icon z13-
 power-tower                                         # icon z13-
 === 450

@@ -1226,7 +1224,6 @@ emergency-emergency_ward_entrance                   # icon z16- (also has captio

 building                                            # caption z16- (also has area z14-)
 building-garage                                     # caption z16- (also has area z14-)
-building-guardhouse                                 # icon z16- (also has caption(optional) z18-, area z14-)
 building-has_parts                                  # caption z16- (also has area z14-)
 man_made-utility_pole                               # icon z15-
 power-plant                                         # icon z17- (also has area z13-)
@@ -1749,7 +1746,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio

 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
 # amenity-bank                                      # caption(optional) z16- (also has icon z16-)
-# amenity-library                                   # caption(optional) z17- (also has icon z17-)
+# amenity-library                                   # caption(optional) z18- (also has icon z18-)
 # amenity-marketplace                               # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-pharmacy                                  # caption(optional) z17- (also has icon z16-)
 # shop-convenience                                  # caption(optional) z16- (also has icon z16-)
@@ -2132,7 +2129,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shower                                    # caption(optional) z17- (also has icon z17-)
 # amenity-toilets                                   # caption(optional) z18- (also has icon z15-)
 # office                                            # caption(optional) z18- (also has icon z18-)
-# office-security                                   # caption(optional) z18- (also has icon z17-)
 # post_office-post_partner                          # caption(optional) z18- (also has icon z18-)
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
@@ -2166,7 +2162,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z16-)
 # === -9750

-# building-guardhouse                               # caption(optional) z18- (also has icon z16-, area z14-)
 # power-plant-wind                                  # caption(optional) z16- (also has icon z13-, area z13-)
 # === -9770

--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -209,9 +209,12 @@ node|z12-14[historic=castle],
 node|z15[historic=fort],
 node|z15[historic=castle],
 {icon-image: remains-m.svg;icon-min-distance: 5;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
-node|z16-[historic=fort],
-node|z16-[historic=castle],
+node|z16[historic=fort],
+node|z16[historic=castle],
+{icon-image: remains-m.svg;text-offset: 1;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z17-[historic=ruins][name],
+node|z17-[historic=fort],
+node|z17-[historic=castle],
 {icon-image: remains-m.svg;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}

 node|z17-[historic=archaeological_site],
@@ -462,21 +465,10 @@ node|z17[amenity=bank],
 node|z18-[amenity=bank],
 {icon-image: bank-m.svg;font-size: 14.5; icon-min-distance: 10;}

-node|z18-[building=guardhouse],
-node|z18-[office=security],
-{icon-image: security-m.svg;}
-/* Reset captions inherited from [building] */
-node|z18-[building=guardhouse],
-{text: none;}
-node|z18-[building=guardhouse]::int_name,
-{text: none;}
-
-node|z17-[amenity=police],
-{icon-image: police-m.svg;}
 node|z17[amenity=police],
-{font-size: 13.75; icon-min-distance: 15;}
+{icon-image: police-m.svg; font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=police],
-{font-size: 14.5; icon-min-distance: 10;}
+{icon-image: police-m.svg; font-size: 14.5; icon-min-distance: 10;}

 node|z12[barrier=toll_booth],
 {icon-image: toll_booth-s.svg; icon-min-distance: 8;}
@@ -597,10 +589,8 @@ node|z15-[amenity=sanitary_dump_station],
 node|z16-[amenity=charging_station],
 node|z16-[amenity=parking],
 area|z16-[landuse=garages],
-node|z16-[tourism=caravan_site],
 node|z17-[amenity=car_wash],
 node|z17-[amenity=toilets],
-node|z18-[tourism=camp_site],
 node|z18-[amenity=motorcycle_rental],
 node|z18-[amenity=car_rental],
 node|z18-[amenity=car_sharing],
@@ -683,21 +673,11 @@ node|z18-[amenity=car_sharing],

 node|z15-[amenity=sanitary_dump_station],
 {icon-image: dump-station-m.svg; font-size: 12.5; icon-min-distance: 20;}
-node|z17[amenity=sanitary_dump_station],
+node|z17-[amenity=sanitary_dump_station],
 {font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=sanitary_dump_station],
 {font-size: 14.5; icon-min-distance: 10;}

-node|z16-[tourism=caravan_site],
-{icon-image: caravan_site-m.svg; font-size: 12.5;}
-node|z17[tourism=caravan_site],
-{font-size: 13.75;}
-node|z18-[tourism=caravan_site],
-{font-size: 14.5;}
-
-node|z18-[tourism=camp_site],
-{icon-image: campsite-m.svg; font-size: 14.5;}
-
 area|z16[landuse=garages],
 {font-size: 12.5;}
 area|z17[landuse=garages],
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -353,7 +353,6 @@ man_made-cutline                                    # line z15-
 barrier-ditch                                       # line z17-
 building                                            # area z15- (also has caption z18-)
 building-garage                                     # area z15- (also has caption z18-)
-building-guardhouse                                 # area z15- (also has icon z18-)
 building-has_parts                                  # area z15- (also has caption z18-)
 building-train_station                              # area z15- (also has caption z18-)
 === 50
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -222,8 +222,6 @@ amenity-vending_machine-parking_tickets             # icon z17- (also has captio
 shop-car_parts                                      # icon z17-
 shop-car_repair                                     # icon z17-
 shop-car_repair-tyres                               # icon z15- (also has caption(optional) z15-)
-tourism-camp_site                                   # icon z18- (also has caption(optional) z18-)
-tourism-caravan_site                                # icon z16- (also has caption(optional) z16-)
 === 2650

 amenity-compressed_air                              # icon z18-
@@ -726,7 +724,6 @@ amenity-parcel_locker                               # icon z17- (also has captio
 amenity-police                                      # icon z17-
 amenity-post_office                                 # icon z17- (also has caption(optional) z17-)
 amenity-toilets                                     # icon z17- (also has caption(optional) z17-)
-office-security                                     # icon z18-
 post_office-post_partner                            # icon z18- (also has caption(optional) z18-)
 shop-motorcycle                                     # icon z17-
 === 200
@@ -749,7 +746,6 @@ building-has_parts                                  # caption z18- (also has are
 === 50

 building-garage                                     # caption z18- (also has area z15-)
-building-guardhouse                                 # icon z18- (also has area z15-)
 === 30

 entrance-main                                       # icon z18- (also has caption(optional) z18-)
@@ -804,8 +800,6 @@ entrance-main                                       # icon z18- (also has captio
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z17-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
-# tourism-camp_site                                 # caption(optional) z18- (also has icon z18-)
-# tourism-caravan_site                              # caption(optional) z16- (also has icon z16-)
 # === -7350

 # amenity-sanitary_dump_station                     # caption(optional) z15- (also has icon z15-)
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -245,7 +245,7 @@ Check if you have a system-wide Java Runtime Environment (JRE) installed:
 java -version
 ```

-If your system doesn't have a JRE installed or Java version is less than 21 (OpenJDK)
+If your system doesn't have a JRE installed or Java version is less than 17 (OpenJDK)
 or you want command line builds to use a JRE version bundled with the Studio
 then set the `JAVA_HOME` environment variable:

--- a/generator/feature_sorter.cpp
+++ b/generator/feature_sorter.cpp
@@ -11,7 +11,6 @@

 #include "routing/routing_helpers.hpp"

-#include "indexer/classificator.hpp"
 #include "indexer/dat_section_header.hpp"
 #include "indexer/feature_impl.hpp"
 #include "indexer/scales.hpp"
@@ -158,11 +157,6 @@ public:
      Polygons const & polys = fb.GetGeometry();
      bool const isCoast = fb.IsCoastCell();

-      static uint32_t const desertType = classif().GetTypeByPath({"natural", "desert"});
-      static uint32_t const glacierType = classif().GetTypeByPath({"natural", "glacier"});
-      // Reduce detalisation of glaciers and deserts on World map.
-      bool const isLowDetail = !IsCountry() && isArea && (fb.HasType(desertType, 2) || fb.HasType(glacierType, 2));
-
      int const scalesStart = static_cast<int>(m_header.GetScalesCount()) - 1;
      for (int i = scalesStart; i >= 0; --i)
      {
@@ -173,17 +167,15 @@ public:
                                 scales::PatchMaxDrawableScale(level)))
        {
          // Increment zoom level for coastline polygons (check and simplification)
-          // to workaround visual artifacts on low zooms https://github.com/organicmaps/organicmaps/issues/2429
+          // for better visual quality in the first geometry batch or whole WorldCoasts.
          /// @todo Probably, better to keep 3 zooms (skip trg0 with fallback to trg1)?
-          if (isCoast && (level <= 1))
+          if (isCoast)
          {
-            // Effectively change simplification zooms to {5, 6, 7, 8} from {3, 5, 7, 9}
-            ++level;
+            if (level <= scales::GetUpperWorldScale())
+              ++level;
            if (i == 0)
              ++level;
          }
-          if (isLowDetail && (level <= scales::GetUpperWorldScale()))
-            --level;

          // Simplify and serialize geometry.
          // The same line simplification algo is used both for lines
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -16,7 +16,11 @@

 #include "defines.hpp"

+#include <algorithm>
 #include <initializer_list>
+#include <limits>
+#include <unordered_map>
+#include <utility>

 #include "3party/opening_hours/opening_hours.hpp"

--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -339,11 +339,6 @@ public:
          brand, [this](BrandsHolder::Brand::Name const & name) { m_inserter(name.m_locale, name.m_name); });
    }

-    // Index branch to support searching by branch name like "McDonald's Downtown" for objects with branch=Downtown.
-    auto const branch = f.GetMetadata(feature::Metadata::FMD_BRANCH);
-    if (!branch.empty())
-      m_inserter(StringUtf8Multilang::kDefaultCode, branch);
-
    // Check for empty name just before categories indexing. After postcodes, and other meta ..
    if (!f.HasName())
      m_skipIndex.SkipEmptyNameTypes(types);
--- a/generator/world_map_generator.hpp
+++ b/generator/world_map_generator.hpp
@@ -176,7 +176,6 @@ public:
    case feature::GeomType::Area:
    {
      /// @todo Initial area threshold to push area objects into World.mwm
-      /// @todo(pastk) Apply an older lower detail threshold of 0.01 to glaciers, deserts and coastlines (islets)
      auto const & geometry = fb.GetOuterGeometry();
      if (GetPolygonArea(geometry.begin(), geometry.end()) < 0.0025)
        return false;
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -69,9 +69,6 @@
 "type.amenity.music_school" = "Music School";
 "type.amenity.language_school" = "Language School";
 "type.office.diplomatic" = "Embassy";
-"type.office.security" = "Security Guards Office";
-"type.building.guardhouse" = "Security Booth";
-"type.power.portal" = "Power Portal";
 "type.amenity.fast_food" = "Fast Food";
 "type.amenity.ferry_terminal" = "Ferry";
 "type.amenity.fire_station" = "Fire Station";
--- a/libs/indexer/ftypes_matcher.cpp
+++ b/libs/indexer/ftypes_matcher.cpp
@@ -459,33 +459,19 @@ OneLevelPOIChecker::OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */)
 TwoLevelPOIChecker::TwoLevelPOIChecker() : ftypes::BaseChecker(2 /* level */)
 {
  Classificator const & c = classif();
-  base::StringIL arr[] = {{"aeroway", "terminal"},
-                          {"aeroway", "gate"},
-                          {"building", "guardhouse"},
-                          {"building", "train_station"},
-                          {"emergency", "defibrillator"},
-                          {"emergency", "fire_hydrant"},
-                          {"emergency", "phone"},
-                          {"highway", "bus_stop"},
-                          {"highway", "elevator"},
-                          {"highway", "ford"},
-                          {"highway", "raceway"},
-                          {"highway", "rest_area"},
-                          {"highway", "services"},
-                          {"highway", "speed_camera"},
-                          {"man_made", "communications_tower"},
-                          {"man_made", "cross"},
-                          {"man_made", "lighthouse"},
-                          {"man_made", "water_tap"},
-                          {"man_made", "water_well"},
-                          {"natural", "beach"},
-                          {"natural", "cave_entrance"},
-                          {"natural", "geyser"},
-                          {"natural", "hot_spring"},
-                          {"natural", "peak"},
-                          {"natural", "saddle"},
-                          {"natural", "spring"},
-                          {"natural", "volcano"},
+  base::StringIL arr[] = {{"aeroway", "terminal"},       {"aeroway", "gate"},
+                          {"building", "train_station"}, {"emergency", "defibrillator"},
+                          {"emergency", "fire_hydrant"}, {"emergency", "phone"},
+                          {"highway", "bus_stop"},       {"highway", "elevator"},
+                          {"highway", "ford"},           {"highway", "raceway"},
+                          {"highway", "rest_area"},      {"highway", "services"},
+                          {"highway", "speed_camera"},   {"man_made", "communications_tower"},
+                          {"man_made", "cross"},         {"man_made", "lighthouse"},
+                          {"man_made", "water_tap"},     {"man_made", "water_well"},
+                          {"natural", "beach"},          {"natural", "cave_entrance"},
+                          {"natural", "geyser"},         {"natural", "hot_spring"},
+                          {"natural", "peak"},           {"natural", "saddle"},
+                          {"natural", "spring"},         {"natural", "volcano"},
                          {"waterway", "waterfall"}};

  for (auto const & path : arr)