diff --git a/app/src/pages/MapContainer.tsx b/app/src/pages/MapContainer.tsx
index 9818286e..57e304c4 100644
--- a/app/src/pages/MapContainer.tsx
+++ b/app/src/pages/MapContainer.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 /* eslint-disable import/no-relative-parent-imports */
 /* eslint-disable array-callback-return */
 /* eslint-disable new-cap */
@@ -47,7 +47,7 @@ function MapContainer({ layers, map }: { layers: LayerProps[]; map: any }) {
         setApis((current) => [
           ...current,
           {
-            id: layer.id!,
+            id: layer.id,
             api: new itemsApi<Place>('items', layer.id, undefined, {
               _or: [
                 {
@@ -95,7 +95,7 @@ function MapContainer({ layers, map }: { layers: LayerProps[]; map: any }) {
               id={layer.id}
               key={layer.id}
               name={layer.name}
-              menuIcon={config.apiUrl + 'assets/' + layer.menuIcon}
+              menuIcon={layer.menuIcon && config.apiUrl + 'assets/' + layer.menuIcon}
               menuText={layer.menuText}
               menuColor={layer.menuColor}
               markerIcon={layer.markerIcon}
diff --git a/lib/src/Components/Map/Subcomponents/AddButton.tsx b/lib/src/Components/Map/Subcomponents/AddButton.tsx
index 5781a1ab..2e17dcf8 100644
--- a/lib/src/Components/Map/Subcomponents/AddButton.tsx
+++ b/lib/src/Components/Map/Subcomponents/AddButton.tsx
@@ -1,8 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { MapPinIcon } from '@heroicons/react/20/solid'
 import SVG from 'react-inlinesvg'
 
 import PlusSVG from '#assets/plus.svg'
+import { useAppState } from '#components/AppShell/hooks/useAppState'
 import { useLayers } from '#components/Map/hooks/useLayers'
 import { useHasUserPermission } from '#components/Map/hooks/usePermissions'
 
@@ -13,6 +15,7 @@ export default function AddButton({
 }) {
   const layers = useLayers()
   const hasUserPermission = useHasUserPermission()
+  const appState = useAppState()
 
   const canAddItems = () => {
     let canAdd = false
@@ -59,11 +62,17 @@ export default function AddButton({
                             e.preventDefault()
                           }}
                         >
-                          <img
-                            src={layer.menuIcon}
-                            className='tw:h-6 tw:w-6 tw:text-white'
-                            style={{ filter: 'invert(100%) brightness(200%)' }}
-                          />
+                          {layer.menuIcon ? (
+                            <SVG
+                              src={appState.assetsApi.url + layer.menuIcon}
+                              className='tw:w-6 tw:h-6'
+                              preProcessor={(code: string) =>
+                                code.replace(/fill=".*?"/g, 'fill="currentColor"')
+                              }
+                            />
+                          ) : (
+                            <MapPinIcon className='tw:h-6 tw:w-6 tw:text-white' />
+                          )}
                         </button>
                       </div>
                     </a>
diff --git a/lib/src/assets/map-pin.svg b/lib/src/assets/map-pin.svg
new file mode 100644
index 00000000..6c3febc9
--- /dev/null
+++ b/lib/src/assets/map-pin.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.69008 18.933L9.69288 18.9342C9.89 19.02 10 19 10 19C10 19 10.11 19.02 10.3079 18.9339L10.3099 18.933L10.3157 18.9304L10.3338 18.922C10.3488 18.915 10.3697 18.9052 10.3959 18.8926C10.4484 18.8673 10.5225 18.8306 10.6153 18.7822C10.8008 18.6855 11.0612 18.5419 11.3717 18.3495C11.9912 17.9655 12.8174 17.3826 13.6455 16.5844C15.3022 14.9876 17 12.4925 17 9C17 5.13401 13.866 2 10 2C6.13401 2 3 5.13401 3 9C3 12.4925 4.69783 14.9876 6.35452 16.5844C7.18264 17.3826 8.00877 17.9655 8.62834 18.3495C8.93879 18.5419 9.19922 18.6855 9.38467 18.7822C9.47745 18.8306 9.55163 18.8673 9.60409 18.8926C9.63033 18.9052 9.65116 18.915 9.66619 18.922L9.68435 18.9304L9.69008 18.933ZM10 11.25C11.2426 11.25 12.25 10.2426 12.25 9C12.25 7.75736 11.2426 6.75 10 6.75C8.75736 6.75 7.75 7.75736 7.75 9C7.75 10.2426 8.75736 11.25 10 11.25Z" fill="#0F172A"/>
+</svg>