diff --git a/data/classificator.txt b/data/classificator.txt
index ba00a46bdb..c57682a030 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -496,12 +496,17 @@ world  +
         city_gate  -
         citywalls  -
         fort  -
+        gallows  -
         memorial  +
+            cross  -
             plaque  -
             sculpture  -
             statue  -
+            stolperstein  -
+            war_memorial  -
             {}
         monument  -
+        pillory  -
         ruins  -
         ship  -
         tomb  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 83ce395dd8..4a919c295c 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 11ab6c9ccc..12bcb9ea09 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -33299,6 +33299,68 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-gallows"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -33388,7 +33450,7 @@ cont {
   }
 }
 cont {
-  name: "historic-memorial-plaque"
+  name: "historic-memorial-cross"
   element {
     scale: 15
     symbol {
@@ -33408,10 +33470,80 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "zero-icon"
+      name: "cross-m"
       priority: 16742
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+}
+cont {
+  name: "historic-memorial-plaque"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
   }
   element {
     scale: 18
@@ -33420,6 +33552,15 @@ cont {
       priority: 16857
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
   }
   element {
     scale: 19
@@ -33428,6 +33569,15 @@ cont {
       priority: 16857
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
   }
 }
 cont {
@@ -33606,6 +33756,146 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-memorial-stolperstein"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "plaque"
+      priority: 16857
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
+  }
+}
+cont {
+  name: "historic-memorial-war_memorial"
+  element {
+    scale: 15
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+}
 cont {
   name: "historic-monument"
   element {
@@ -33728,6 +34018,68 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-pillory"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+}
 cont {
   name: "historic-ruins"
   element {
@@ -33946,7 +34298,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33963,7 +34315,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33980,7 +34332,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33997,7 +34349,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 28cf7eefbc..d755245729 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index fdaa1b730d..b3cb231d9b 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -32940,6 +32940,68 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-gallows"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -33029,7 +33091,7 @@ cont {
   }
 }
 cont {
-  name: "historic-memorial-plaque"
+  name: "historic-memorial-cross"
   element {
     scale: 15
     symbol {
@@ -33049,10 +33111,80 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "zero-icon"
+      name: "cross-m"
       priority: 16742
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+}
+cont {
+  name: "historic-memorial-plaque"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
   }
   element {
     scale: 18
@@ -33061,6 +33193,15 @@ cont {
       priority: 16857
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
   }
   element {
     scale: 19
@@ -33069,6 +33210,15 @@ cont {
       priority: 16857
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
   }
 }
 cont {
@@ -33247,6 +33397,146 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-memorial-stolperstein"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "plaque"
+      priority: 16857
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
+  }
+}
+cont {
+  name: "historic-memorial-war_memorial"
+  element {
+    scale: 15
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+}
 cont {
   name: "historic-monument"
   element {
@@ -33369,6 +33659,68 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-pillory"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+}
 cont {
   name: "historic-ruins"
   element {
@@ -33587,7 +33939,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33604,7 +33956,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33621,7 +33973,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33638,7 +33990,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index fd653d9f7b..72bf968f5f 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 00b247ec82..23dced598f 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -33088,6 +33088,68 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-gallows"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -33177,7 +33239,7 @@ cont {
   }
 }
 cont {
-  name: "historic-memorial-plaque"
+  name: "historic-memorial-cross"
   element {
     scale: 15
     symbol {
@@ -33197,10 +33259,80 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "zero-icon"
+      name: "cross-m"
       priority: 16742
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+}
+cont {
+  name: "historic-memorial-plaque"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
   }
   element {
     scale: 18
@@ -33209,6 +33341,15 @@ cont {
       priority: 16857
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
   }
   element {
     scale: 19
@@ -33217,6 +33358,15 @@ cont {
       priority: 16857
       min_distance: 12
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
   }
 }
 cont {
@@ -33395,6 +33545,146 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-memorial-stolperstein"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "zero-icon"
+      priority: 16685
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "plaque"
+      priority: 16857
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15857
+    }
+  }
+}
+cont {
+  name: "historic-memorial-war_memorial"
+  element {
+    scale: 15
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16742
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15742
+    }
+  }
+}
 cont {
   name: "historic-monument"
   element {
@@ -33517,6 +33807,68 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-pillory"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16600
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15600
+    }
+  }
+}
 cont {
   name: "historic-ruins"
   element {
@@ -33735,7 +34087,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33752,7 +34104,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33769,7 +34121,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
@@ -33786,7 +34138,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "monument-m"
+      name: "cross-m"
       priority: 16600
       min_distance: 8
     }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 49f43a74cc..4f7085b39a 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index e828d49c2c..a7f7f6f88d 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -19932,6 +19932,73 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-gallows"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -20015,6 +20082,73 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-memorial-cross"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cross-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+}
 cont {
   name: "historic-memorial-plaque"
   element {
@@ -20044,7 +20178,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "plaque"
+      name: "zero-icon"
       priority: 16788
       min_distance: 12
     }
@@ -20052,7 +20186,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "plaque"
+      name: "zero-icon"
       priority: 16788
       min_distance: 12
     }
@@ -20224,6 +20358,132 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-memorial-stolperstein"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+}
+cont {
+  name: "historic-memorial-war_memorial"
+  element {
+    scale: 15
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+}
 cont {
   name: "historic-monument"
   element {
@@ -20321,6 +20581,73 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-pillory"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+}
 cont {
   name: "historic-ruins"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 1a731d30ca..2d50174d19 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 7a1528e38d..361ab60c38 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -20256,6 +20256,73 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-gallows"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+}
 cont {
   name: "historic-memorial"
   element {
@@ -20339,6 +20406,73 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-memorial-cross"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cross-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "cross-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "cross-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+}
 cont {
   name: "historic-memorial-plaque"
   element {
@@ -20368,7 +20502,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "plaque"
+      name: "zero-icon"
       priority: 16788
       min_distance: 12
     }
@@ -20376,7 +20510,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "plaque"
+      name: "zero-icon"
       priority: 16788
       min_distance: 12
     }
@@ -20548,6 +20682,132 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-memorial-stolperstein"
+  element {
+    scale: 15
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 24
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "zero-icon"
+      priority: 16788
+      min_distance: 12
+    }
+  }
+}
+cont {
+  name: "historic-memorial-war_memorial"
+  element {
+    scale: 15
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16788
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15788
+    }
+  }
+}
 cont {
   name: "historic-monument"
   element {
@@ -20645,6 +20905,73 @@ cont {
     }
   }
 }
+cont {
+  name: "historic-pillory"
+  element {
+    scale: 16
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "monument-m"
+      priority: 16764
+      min_distance: 8
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15764
+    }
+  }
+}
 cont {
   name: "historic-ruins"
   element {
diff --git a/data/types.txt b/data/types.txt
index 49d7a581a3..b9b2ec7fbd 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -890,11 +890,11 @@ railway|subway|tunnel
 railway|subway|tunnel
 railway|subway|tunnel
 railway|subway|tunnel
-mapswithme
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*historic|memorial|stolperstein
+*historic|memorial|war_memorial
+*historic|memorial|cross
+*historic|gallows
+*historic|pillory
 mapswithme
 mapswithme
 railway|subway|tunnel
diff --git a/data/visibility.txt b/data/visibility.txt
index 1da1f2bdf7..e4532be29b 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -496,12 +496,17 @@ world  00000000000000000000  +
         city_gate  00000000000001111111  -
         citywalls  00000000000000011111  -
         fort  00000000000011111111  -
+        gallows  00000000000000001111  -
         memorial  00000000000000011111  +
+            cross  00000000000000011111  -
             plaque  00000000000000011111  -
             sculpture  00000000000000011111  -
             statue  00000000000000011111  -
+            stolperstein  00000000000000011111  -
+            war_memorial  00000000000000011111  -
             {}
         monument  00000000000001111111  -
+        pillory  00000000000000001111  -
         ruins  00000000000000000111  -
         ship  00000000000000001111  -
         tomb  00000000000000001111  -