diff --git a/components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php b/components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php
index 5d8a753a43b3..108830f5f3f8 100755
--- a/components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php
+++ b/components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php
@@ -1,8 +1,23 @@
 <?php
 
-declare(strict_types=1);
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ ********************************************************************
+ */
 
-/* Copyright (c) 2018 - Richard Klees <richard.klees@concepts-and-training.de> - Extended GPL, see LICENSE */
+declare(strict_types=1);
 
 /**
  * User interface class for OpenLayers maps
@@ -61,7 +76,6 @@ public function getHtml(): string
         );
 
         $this->lng->loadLanguageModule("maps");
-        $this->tpl->addCss("public/node_modules/ol/ol.css");
         $this->tpl->addCss("components/ILIAS/Maps/css/service_openlayers.css");
         $this->tpl->addJavaScript("assets/js/ServiceOpenLayers.js");
 
diff --git a/components/ILIAS/Maps/images/mm_20_blue.png b/components/ILIAS/Maps/images/mm_20_blue.png
deleted file mode 100755
index 2ec9ae941ad2..000000000000
Binary files a/components/ILIAS/Maps/images/mm_20_blue.png and /dev/null differ
diff --git a/components/ILIAS/Maps/images/mm_20_shadow.png b/components/ILIAS/Maps/images/mm_20_shadow.png
deleted file mode 100755
index 3a89759fca2a..000000000000
Binary files a/components/ILIAS/Maps/images/mm_20_shadow.png and /dev/null differ
diff --git a/components/ILIAS/Maps/js/src/ServiceOpenLayers.js b/components/ILIAS/Maps/js/src/ServiceOpenLayers.js
index 53f2501139ff..1bcdfc534e71 100755
--- a/components/ILIAS/Maps/js/src/ServiceOpenLayers.js
+++ b/components/ILIAS/Maps/js/src/ServiceOpenLayers.js
@@ -1,3 +1,18 @@
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ */
+
 import View from 'ol/View';
 import Map from 'ol/Map';
 import TileLayer from 'ol/layer/Tile';
@@ -248,7 +263,7 @@ export default class ServiceOpenLayers {
         marker.setPosition(pos);
         this.map.addOverlay(marker);
 
-        element.innerHTML = "<img src='./components/ILIAS/Maps/images/mm_20_blue.png'>";
+        element.innerHTML = "<img src='./assets/images/standard/icon_mapm.svg'>";
     }
 
     /**
diff --git a/components/ILIAS/Maps/resources/ServiceOpenLayers.js b/components/ILIAS/Maps/resources/ServiceOpenLayers.js
index 165f0cf54dea..ae516d91b858 100644
--- a/components/ILIAS/Maps/resources/ServiceOpenLayers.js
+++ b/components/ILIAS/Maps/resources/ServiceOpenLayers.js
@@ -21445,7 +21445,7 @@ class ServiceOpenLayers {
         marker.setPosition(pos);
         this.map.addOverlay(marker);
 
-        element.innerHTML = "<img src='./components/ILIAS/Maps/images/mm_20_blue.png'>";
+        element.innerHTML = "<img src='./assets/images/standard/icon_mapm.svg'>";
     }
 
     /**
diff --git a/components/ILIAS/Maps/templates/default/tpl.google_map.js b/components/ILIAS/Maps/templates/default/tpl.google_map.js
index ce39bf71dca4..29fff34fa9c6 100755
--- a/components/ILIAS/Maps/templates/default/tpl.google_map.js
+++ b/components/ILIAS/Maps/templates/default/tpl.google_map.js
@@ -1,3 +1,18 @@
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ */
+
 ilMapData = Array();
 ilMap = Array();
 ilMapOptions = [];
@@ -12,16 +27,10 @@ ilMapUserMarker["{UMAP_ID}"][{CNT}] = new Array({ULAT},{ULONG}, "<div style='wid
 if (google.maps)
 {
     var ilMarkerImage = new google.maps.MarkerImage(
-        "./components/ILIAS/Maps/images/mm_20_blue.png",
+        "./assets/images/standard/icon_mapm.svg",
         new google.maps.Size(12, 20),
         new google.maps.Point(0,0),
         new google.maps.Point(6, 20));
-
-    var ilMarkerShadow = new google.maps.MarkerImage(
-        "./components/ILIAS/Maps/images/mm_20_shadow.png",
-        new google.maps.Size(22, 20),
-        new google.maps.Point(0,0),
-        new google.maps.Point(0, 32));
 }
 
 if (google.maps)
@@ -194,7 +203,6 @@ function ilCreateMarker(map, latitude, longitude)
     var marker = new google.maps.Marker({
         position: point,
         icon: ilMarkerImage,
-        shadow: ilMarkerShadow,
         map: map
     });
     return marker;
diff --git a/components/ILIAS/UI/resources/images/standard/icon_mapm.svg b/components/ILIAS/UI/resources/images/standard/icon_mapm.svg
new file mode 100644
index 000000000000..3ff6d790e562
--- /dev/null
+++ b/components/ILIAS/UI/resources/images/standard/icon_mapm.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="320" height="320" viewBox="0 0 320 320"><defs><style>.cls-1{fill:none;}.cls-2{fill:#4c6586;}</style></defs><rect class="cls-1" y="0" width="320" height="320"/><g id="Pin"><path class="cls-2" d="M160,.4c-66.07.09-119.61,53.63-119.7,119.7,0,85.93,111.52,193.56,116.26,198.1,1.92,1.86,4.97,1.86,6.88,0,4.74-4.54,116.26-112.17,116.26-198.1C279.61,54.03,226.07.49,160,.4ZM160,174.96c-30.3,0-54.86-24.56-54.86-54.86s24.56-54.86,54.86-54.86,54.86,24.56,54.86,54.86c-.02,30.29-24.57,54.84-54.86,54.86Z"/></g></svg>
\ No newline at end of file
diff --git a/templates/default/070-components/_index.scss b/templates/default/070-components/_index.scss
index adba31321419..32208c2687f4 100755
--- a/templates/default/070-components/_index.scss
+++ b/templates/default/070-components/_index.scss
@@ -55,7 +55,7 @@
 @use "./legacy/_component_LeftNavSpace.scss";
 @use "./legacy/_component_link.scss";
 @use "./legacy/_component_map.scss";
-@use "./legacy/component_media-object";
+@use "./legacy/_component_media-object";
 @use "./legacy/_component_overlay.scss";
 @use "./legacy/_component_rightPanel.scss";
 @use "./legacy/_component_delostable.scss";
@@ -64,11 +64,11 @@
 
 /* Adapted from Bootstrap 3 */
 
-@use "./legacy/component_animated-collapse-fade";
-@use "./legacy/component_btn-group";
-@use "./legacy/component_carousel";
-@use "./legacy/component_input-group";
-@use "./legacy/component_screen-reader-only";
+@use "./legacy/_component_animated-collapse-fade";
+@use "./legacy/_component_btn-group";
+@use "./legacy/_component_carousel";
+@use "./legacy/_component_input-group";
+@use "./legacy/_component_screen-reader-only";
 
 /* Legacy Modules & Services */
 
@@ -113,6 +113,7 @@
 @use "./legacy/Services/_component_learninghistory.scss";
 @use "./legacy/Services/_component_like.scss";
 @use "./legacy/Services/_component_mail.scss";
+@use "./legacy/Services/_component_openlayers.scss";
 @use "./legacy/Services/_component_mediaobjects.scss";
 @use "./legacy/Services/_component_membership.scss";
 @use "./legacy/Services/_component_navigation.scss";
diff --git a/templates/default/070-components/legacy/Services/_component_openlayers.scss b/templates/default/070-components/legacy/Services/_component_openlayers.scss
new file mode 100644
index 000000000000..6f80f4125926
--- /dev/null
+++ b/templates/default/070-components/legacy/Services/_component_openlayers.scss
@@ -0,0 +1,181 @@
+.ol-viewport, .ol-unselectable {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
+}
+
+.ol-selectable {
+  -webkit-touch-callout: default;
+  -webkit-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+}
+
+.ol-control {
+  position: absolute;
+  background-color: rgba(255,255,255,0.4);
+  border-radius: 4px;
+  padding: 2px;
+}
+
+.ol-control:hover {
+  background-color: rgba(255,255,255,0.6);
+}
+
+.ol-zoom {
+  top: .5em;
+  left: .5em;
+}
+
+.ol-rotate {
+  top: .5em;
+  right: .5em;
+  transition: opacity .25s linear, visibility 0s linear;
+}
+
+.ol-rotate.ol-hidden {
+  opacity: 0;
+  visibility: hidden;
+  transition: opacity .25s linear, visibility 0s linear .25s;
+}
+
+.ol-zoom-extent {
+  top: 4.643em;
+  left: .5em;
+}
+
+.ol-full-screen {
+  right: .5em;
+  top: .5em;
+}
+
+.ol-control button {
+  display: block;
+  margin: 1px;
+  padding: 0;
+  color: white;
+  font-weight: bold;
+  text-decoration: none;
+  font-size: inherit;
+  text-align: center;
+  height: 1.375em;
+  width: 1.375em;
+  line-height: .4em;
+  background-color: rgba(0,60,136,0.5);
+  border: none;
+  border-radius: 2px;
+}
+
+.ol-control button::-moz-focus-inner {
+  border: none;
+  padding: 0;
+}
+
+.ol-zoom-extent button {
+  line-height: 1.4em;
+}
+
+.ol-compass {
+  display: block;
+  font-weight: normal;
+  font-size: 1.2em;
+  will-change: transform;
+}
+
+.ol-touch .ol-control button {
+  font-size: 1.5em;
+}
+
+.ol-touch .ol-zoom-extent {
+  top: 5.5em;
+}
+
+.ol-control button:hover,
+.ol-control button:focus {
+  text-decoration: none;
+  background-color: rgba(0,60,136,0.7);
+}
+
+.ol-zoom .ol-zoom-in {
+  border-radius: 2px 2px 0 0;
+}
+
+.ol-zoom .ol-zoom-out {
+  border-radius: 0 0 2px 2px;
+}
+
+.ol-attribution {
+  text-align: right;
+  bottom: .5em;
+  right: .5em;
+  max-width: calc(100% - 1.3em);
+  display: flex;
+  flex-flow: row-reverse;
+  align-items: center;
+}
+
+.ol-attribution a {
+  color: rgba(0,60,136,0.7);
+  text-decoration: none;
+}
+
+.ol-attribution ul {
+  margin: 0;
+  padding: 1px .5em;
+  color: #000;
+  text-shadow: 0 0 2px #fff;
+  font-size: 12px;
+}
+
+.ol-attribution li {
+  display: inline;
+  list-style: none;
+}
+
+.ol-attribution li:not(:last-child):after {
+  content: " ";
+}
+
+.ol-attribution img {
+  max-height: 2em;
+  max-width: inherit;
+  vertical-align: middle;
+}
+
+.ol-attribution button {
+  flex-shrink: 0;
+}
+
+.ol-attribution.ol-collapsed ul {
+  display: none;
+}
+
+.ol-attribution:not(.ol-collapsed) {
+  background: rgba(255,255,255,0.8);
+}
+
+.ol-attribution.ol-uncollapsible {
+  bottom: 0;
+  right: 0;
+  border-radius: 4px 0 0;
+}
+
+.ol-attribution.ol-uncollapsible img {
+  margin-top: -.2em;
+  max-height: 1.6em;
+}
+
+.ol-attribution.ol-uncollapsible button {
+  display: none;
+}
+
+.marker {
+  img {
+    width: 25px;
+    height: 25px;
+  }
+}
diff --git a/templates/default/delos.css b/templates/default/delos.css
index 41a194a89492..3f846183072d 100644
--- a/templates/default/delos.css
+++ b/templates/default/delos.css
@@ -17357,6 +17357,186 @@ a.mailunread, a.mailunread:visited {
   width: auto;
 }
 
+.ol-viewport, .ol-unselectable {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+.ol-selectable {
+  -webkit-touch-callout: default;
+  -webkit-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
+}
+
+.ol-control {
+  position: absolute;
+  background-color: rgba(255, 255, 255, 0.4);
+  border-radius: 4px;
+  padding: 2px;
+}
+
+.ol-control:hover {
+  background-color: rgba(255, 255, 255, 0.6);
+}
+
+.ol-zoom {
+  top: 0.5em;
+  left: 0.5em;
+}
+
+.ol-rotate {
+  top: 0.5em;
+  right: 0.5em;
+  transition: opacity 0.25s linear, visibility 0s linear;
+}
+
+.ol-rotate.ol-hidden {
+  opacity: 0;
+  visibility: hidden;
+  transition: opacity 0.25s linear, visibility 0s linear 0.25s;
+}
+
+.ol-zoom-extent {
+  top: 4.643em;
+  left: 0.5em;
+}
+
+.ol-full-screen {
+  right: 0.5em;
+  top: 0.5em;
+}
+
+.ol-control button {
+  display: block;
+  margin: 1px;
+  padding: 0;
+  color: white;
+  font-weight: bold;
+  text-decoration: none;
+  font-size: inherit;
+  text-align: center;
+  height: 1.375em;
+  width: 1.375em;
+  line-height: 0.4em;
+  background-color: rgba(0, 60, 136, 0.5);
+  border: none;
+  border-radius: 2px;
+}
+
+.ol-control button::-moz-focus-inner {
+  border: none;
+  padding: 0;
+}
+
+.ol-zoom-extent button {
+  line-height: 1.4em;
+}
+
+.ol-compass {
+  display: block;
+  font-weight: normal;
+  font-size: 1.2em;
+  will-change: transform;
+}
+
+.ol-touch .ol-control button {
+  font-size: 1.5em;
+}
+
+.ol-touch .ol-zoom-extent {
+  top: 5.5em;
+}
+
+.ol-control button:hover,
+.ol-control button:focus {
+  text-decoration: none;
+  background-color: rgba(0, 60, 136, 0.7);
+}
+
+.ol-zoom .ol-zoom-in {
+  border-radius: 2px 2px 0 0;
+}
+
+.ol-zoom .ol-zoom-out {
+  border-radius: 0 0 2px 2px;
+}
+
+.ol-attribution {
+  text-align: right;
+  bottom: 0.5em;
+  right: 0.5em;
+  max-width: calc(100% - 1.3em);
+  display: flex;
+  flex-flow: row-reverse;
+  align-items: center;
+}
+
+.ol-attribution a {
+  color: rgba(0, 60, 136, 0.7);
+  text-decoration: none;
+}
+
+.ol-attribution ul {
+  margin: 0;
+  padding: 1px 0.5em;
+  color: #000;
+  text-shadow: 0 0 2px #fff;
+  font-size: 12px;
+}
+
+.ol-attribution li {
+  display: inline;
+  list-style: none;
+}
+
+.ol-attribution li:not(:last-child):after {
+  content: " ";
+}
+
+.ol-attribution img {
+  max-height: 2em;
+  max-width: inherit;
+  vertical-align: middle;
+}
+
+.ol-attribution button {
+  flex-shrink: 0;
+}
+
+.ol-attribution.ol-collapsed ul {
+  display: none;
+}
+
+.ol-attribution:not(.ol-collapsed) {
+  background: rgba(255, 255, 255, 0.8);
+}
+
+.ol-attribution.ol-uncollapsible {
+  bottom: 0;
+  right: 0;
+  border-radius: 4px 0 0;
+}
+
+.ol-attribution.ol-uncollapsible img {
+  margin-top: -0.2em;
+  max-height: 1.6em;
+}
+
+.ol-attribution.ol-uncollapsible button {
+  display: none;
+}
+
+.marker img {
+  width: 25px;
+  height: 25px;
+}
+
 /* Services/MediaObjects */
 .ilPlayerPreviewOverlayOuter {
   position: relative;