diff --git a/src/client/src/components/map/WebGLMap.tsx b/src/client/src/components/map/WebGLMap.tsx
index c08de09..e63e19b 100644
--- a/src/client/src/components/map/WebGLMap.tsx
+++ b/src/client/src/components/map/WebGLMap.tsx
@@ -2650,10 +2650,10 @@ export const WebGLMap = observer(() => {
                     onTouchEnd={handleClusterClick}
                     style={{
                       position: "absolute",
-                      left: iconLeft - 25,
-                      top: iconTop - 25,
-                      width: iconSize + 50,
-                      height: iconSize + 50,
+                      left: iconLeft,
+                      top: iconTop,
+                      width: iconSize,
+                      height: iconSize,
                       pointerEvents: "auto",
                       cursor: "pointer",
                       userSelect: "none",
@@ -2669,8 +2669,6 @@ export const WebGLMap = observer(() => {
                     <div
                       style={{
                         position: "absolute",
-                        left: 25,
-                        top: 25,
                         width: iconSize,
                         height: iconSize,
                         flexShrink: 0,
diff --git a/src/shared/modals/UploadMediaDialog/index.tsx b/src/shared/modals/UploadMediaDialog/index.tsx
index 53d2ec8..cb7f80c 100644
--- a/src/shared/modals/UploadMediaDialog/index.tsx
+++ b/src/shared/modals/UploadMediaDialog/index.tsx
@@ -103,8 +103,26 @@ export const UploadMediaDialog = observer(
 
         setMediaFile(initialFile);
         setMediaFilename(initialFile.name);
-        setAvailableMediaTypes([2]);
-        setMediaType(2);
+
+        const extension = initialFile.name.split(".").pop()?.toLowerCase();
+        if (extension) {
+          if (["glb", "gltf"].includes(extension)) {
+            setAvailableMediaTypes([6]);
+            setMediaType(6);
+          }
+          if (
+            ["jpg", "jpeg", "png", "gif", "svg", "webp", "bmp"].includes(
+              extension
+            )
+          ) {
+            setAvailableMediaTypes([1, 3, 4, 5]);
+            setMediaType(1);
+          } else if (["mp4", "webm", "mov"].includes(extension)) {
+            setAvailableMediaTypes([2]);
+            setMediaType(2);
+          }
+        }
+
         const newBlobUrl = URL.createObjectURL(initialFile);
         setMediaUrl(newBlobUrl);
         previousMediaUrlRef.current = newBlobUrl;