diff --git a/package-lock.json b/package-lock.json
index 201f414d..a83dd2c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "utopia-ui",
-  "version": "3.0.81",
+  "version": "3.0.85",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "utopia-ui",
-      "version": "3.0.81",
+      "version": "3.0.85",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@heroicons/react": "^2.0.17",
diff --git a/package.json b/package.json
index 6b8101f3..076bc3bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "utopia-ui",
-  "version": "3.0.81",
+  "version": "3.0.85",
   "description": "Reuseable React Components to build mapping apps for real life communities and networks",
   "repository": "https://github.com/utopia-os/utopia-ui",
   "homepage": "https://utopia-os.org/",
diff --git a/src/Components/Profile/Subcomponents/GalleryView.tsx b/src/Components/Profile/Subcomponents/GalleryView.tsx
index be2e7830..d167aec0 100644
--- a/src/Components/Profile/Subcomponents/GalleryView.tsx
+++ b/src/Components/Profile/Subcomponents/GalleryView.tsx
@@ -9,26 +9,25 @@ import type { Item } from '#types/Item'
 export const GalleryView = ({ item }: { item: Item }) => {
   const [index, setIndex] = useState(-1)
   const appState = useAppState()
-  const images = item.gallery?.map((i, j) => {
-    return {
+  const images =
+    item.gallery?.map((i, j) => ({
       src: appState.assetsApi.url + `${i.directus_files_id.id}.jpg`,
       width: i.directus_files_id.width,
       height: i.directus_files_id.height,
       index: j,
-    }
-  })
+    })) ?? []
 
-  if (!images) throw new Error('GalleryView: images is undefined')
+  if (images.length > 0)
+    return (
+      <div className='tw:mx-6 tw:mb-6'>
+        <RowsPhotoAlbum
+          photos={images}
+          targetRowHeight={150}
+          onClick={({ index: current }) => setIndex(current)}
+        />
 
-  return (
-    <div className='tw:mx-6 tw:mb-6'>
-      <RowsPhotoAlbum
-        photos={images}
-        targetRowHeight={150}
-        onClick={({ index: current }) => setIndex(current)}
-      />
-
-      <ReactLightbox index={index} slides={images} open={index >= 0} close={() => setIndex(-1)} />
-    </div>
-  )
+        <ReactLightbox index={index} slides={images} open={index >= 0} close={() => setIndex(-1)} />
+      </div>
+    )
+  else return <></>
 }
diff --git a/src/Utils/MarkerIconFactory.ts b/src/Utils/MarkerIconFactory.ts
index e6229fcd..1b1bcf35 100644
--- a/src/Utils/MarkerIconFactory.ts
+++ b/src/Utils/MarkerIconFactory.ts
@@ -71,6 +71,12 @@ const addIcon = (icon: string) => {
       return '<svg class="circle-dot-icon" stroke="#fff" fill="transparent" stroke-width="2.5" viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" height="1.55em" width="1.55em" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="10"></circle><circle cx="12" cy="12" r="1"></circle></svg>'
     case 'cannabis':
       return '<svg class="network-icon" stroke="currentColor" fill="#fff" stroke-width="0" viewBox="0 0 512 512" height="1.5em" width="1.5em" xmlns="http://www.w3.org/2000/svg"><path d="M256 0c5.3 0 10.3 2.7 13.3 7.1c15.8 23.5 36.7 63.7 49.2 109c7.2 26.4 11.8 55.2 10.4 84c11.5-8.8 23.7-16.7 35.8-23.6c41-23.3 84.4-36.9 112.2-42.5c5.2-1 10.7 .6 14.4 4.4s5.4 9.2 4.4 14.5c-5.6 27.7-19.3 70.9-42.7 111.7c-9.1 15.9-19.9 31.7-32.4 46.3c27.8 6.6 52.4 17.3 67.2 25.5c5.1 2.8 8.2 8.2 8.2 14s-3.2 11.2-8.2 14c-15.2 8.4-40.9 19.5-69.8 26.1c-20.2 4.6-42.9 7.2-65.2 4.6l8.3 33.1c1.5 6.1-.6 12.4-5.5 16.4s-11.6 4.6-17.2 1.9L280 417.2l0 70.8c0 13.3-10.7 24-24 24s-24-10.7-24-24l0-70.8-58.5 29.1c-5.6 2.8-12.3 2.1-17.2-1.9s-7-10.3-5.5-16.4l8.3-33.1c-22.2 2.6-45 0-65.2-4.6c-28.9-6.6-54.6-17.6-69.8-26.1c-5.1-2.8-8.2-8.2-8.2-14s3.2-11.2 8.2-14c14.8-8.2 39.4-18.8 67.2-25.5C78.9 296.3 68.1 280.5 59 264.6c-23.4-40.8-37.1-84-42.7-111.7c-1.1-5.2 .6-10.7 4.4-14.5s9.2-5.4 14.4-4.4c27.9 5.5 71.2 19.2 112.2 42.5c12.1 6.9 24.3 14.7 35.8 23.6c-1.4-28.7 3.1-57.6 10.4-84c12.5-45.3 33.4-85.5 49.2-109c3-4.4 8-7.1 13.3-7.1z"></path></svg>'
+    case 'steps':
+      return '<svg class="steps-icon" stroke="currentColor" fill="#fff" stroke-width="0" viewBox="0 0 512 512" height="1.4em" width="1.4em" xmlns="http://www.w3.org/2000/svg"><path d="M133.83 361.27c-22.61 0-41-8.17-54.79-24.39s-22.84-40.29-28.11-75.31c-7.76-51.61-.06-95.11 21.68-122.48 12.8-16.12 29.6-25.44 48.58-26.94 16.25-1.3 40.54 5.29 64 44 14.69 24.24 25.86 56.44 30.65 88.34 5.79 38.51 1.48 66.86-13.18 86.65-11.64 15.72-29.54 25.46-53.21 29a106.46 106.46 0 0 1-15.62 1.13zM173 496c-13.21 0-26.6-4.23-38.66-12.36a79.79 79.79 0 0 1-33.52-50.6c-2.85-14.66-1.14-26.31 5.22-35.64 10.33-15.15 28.87-18.56 48.49-22.18 2.07-.38 4.17-.76 6.3-1.17 4.52-.86 9.14-2 13.62-3.11 16.78-4.14 34.14-8.43 48.47 1.75 9.59 6.8 15 18.36 16.62 35.32 1.84 19.57-2.36 39.1-11.83 55-10.19 17.11-25.47 28.42-43 31.86A61 61 0 0 1 173 496zm205.17-230.73a106.69 106.69 0 0 1-15.6-1.2c-23.66-3.5-41.56-13.25-53.2-29-14.66-19.79-19-48.13-13.18-86.65 4.79-31.93 15.93-64.1 30.55-88.25 23.34-38.57 47.66-45.26 64-44.08 18.92 1.38 35.69 10.57 48.51 26.6 21.89 27.37 29.65 71 21.86 122.84-5.27 35-14.2 58.95-28.11 75.31s-32.22 24.43-54.83 24.43zM339 400a61 61 0 0 1-11.68-1.13c-17.56-3.44-32.84-14.75-43-31.86-9.47-15.9-13.67-35.43-11.83-55 1.6-17 7-28.52 16.62-35.33 14.33-10.17 31.69-5.89 48.47-1.74 4.48 1.1 9.1 2.24 13.62 3.11l6.29 1.17c19.63 3.61 38.17 7 48.5 22.17 6.36 9.33 8.07 21 5.22 35.64a79.78 79.78 0 0 1-33.52 50.61C365.56 395.78 352.17 400 339 400z"></path></svg>'
+    case 'suitcase':
+      return '<svg class="suitcase-icon" stroke="#fff" fill="#fff" stroke-width="0" viewBox="0 0 16 16" height="1.3em" width="1.3em" xmlns="http://www.w3.org/2000/svg"><path d="M7 0a2 2 0 0 0-2 2H1.5A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14H2a.5.5 0 0 0 1 0h10a.5.5 0 0 0 1 0h.5a1.5 1.5 0 0 0 1.5-1.5v-9A1.5 1.5 0 0 0 14.5 2H11a2 2 0 0 0-2-2zM6 2a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1zM3 13V3h1v10zm9 0V3h1v10z"></path></svg>'
+    case 'offer':
+      return '<svg class="offer-icon" width="1.35em" height="1.35em" fill="#fff" stroke="currentColor" stroke-width="0" version="1.1" viewBox="-2 -2 23 23" xmlns="http://www.w3.org/2000/svg"><path d="m19.41 9.58-9-9c-0.36-0.36-0.86-0.58-1.41-0.58h-7c-1.1 0-2 0.9-2 2v7c0 0.55 0.22 1.05 0.59 1.42l9 9c0.36 0.36 0.86 0.58 1.41 0.58s1.05-0.22 1.41-0.59l7-7c0.37-0.36 0.59-0.86 0.59-1.41s-0.23-1.06-0.59-1.42zm-15.91-4.58c-0.83 0-1.5-0.67-1.5-1.5s0.67-1.5 1.5-1.5 1.5 0.67 1.5 1.5-0.67 1.5-1.5 1.5z"/></svg>'
     default:
       return ''
   }
diff --git a/src/assets/css/leaflet.css b/src/assets/css/leaflet.css
index 1092c697..5451da91 100644
--- a/src/assets/css/leaflet.css
+++ b/src/assets/css/leaflet.css
@@ -25,6 +25,10 @@
     border-radius: var(--radius-box);
 }
 
+.leaflet-popup-tip-container, .leaflet-popup-tip{
+    border-radius: 0;
+}
+
 .leaflet-tooltip {
     background-color: var(--color-base-100);
     color: var(--color-base-content);
diff --git a/src/assets/css/marker-icons.css b/src/assets/css/marker-icons.css
index c69102d3..836c1ef0 100644
--- a/src/assets/css/marker-icons.css
+++ b/src/assets/css/marker-icons.css
@@ -115,4 +115,25 @@
     top: -36px;
     left: 4px;
     width: 24px;
+}
+
+.steps-icon {
+    position: relative;
+    top: -34px;
+    left: 4px;
+    width: 24px;
+}
+
+.suitcase-icon {
+    position: relative;
+    top: -34px;
+    left: 4px;
+    width: 24px;
+}
+
+.offer-icon {
+    position: relative;
+    top: -34.5px;
+    left: 4px;
+    width: 24px;
 }
\ No newline at end of file