diff --git a/src/Components/Map/Layer.tsx b/src/Components/Map/Layer.tsx
index d81c846e..5b6051c0 100644
--- a/src/Components/Map/Layer.tsx
+++ b/src/Components/Map/Layer.tsx
@@ -128,6 +128,8 @@ export const Layer = ( {
                         let color1 = markerDefaultColor;
                         let color2 = "RGBA(35, 31, 32, 0.2)";
                         if (itemColorField) color1 = getValue(item, itemColorField);
+                        if(color1 == null) color1 = markerDefaultColor;
+                        
                         else if (tags && tags[0]) {
                             color1 = tags[0].color;
                         }
@@ -149,7 +151,7 @@ export const Layer = ( {
                                                         r && addPopup(item, r as Popup);
                                                 }} key={item.id + item.name}
                                                     title={itemTitleField && item ? getValue(item, itemTitleField) : undefined}
-                                                    avatar={itemAvatarField && item ? assetsApi.url + getValue(item, itemAvatarField) : undefined}
+                                                    avatar={itemAvatarField && item && getValue(item, itemAvatarField)? assetsApi.url + getValue(item, itemAvatarField) : undefined}
                                                     owner={itemOwnerField && item ? getValue(item, itemOwnerField) : undefined}
                                                     item={item}
                                                     setItemFormPopup={setItemFormPopup}>
@@ -163,7 +165,7 @@ export const Layer = ( {
                                                 if (!(item.id in leafletRefs))
                                                     r && addPopup(item, r as Popup);
                                             }} title={itemTitleField && item ? getValue(item, itemTitleField) : undefined}
-                                                avatar={itemAvatarField && item ? assetsApi.url + getValue(item, itemAvatarField) : undefined}
+                                                avatar={itemAvatarField && item  && getValue(item, itemAvatarField)? assetsApi.url + getValue(item, itemAvatarField) : undefined}
                                                 owner={itemOwnerField && item ? getValue(item, itemOwnerField) : undefined}
                                                 item={item}
                                                 setItemFormPopup={setItemFormPopup} />
diff --git a/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx b/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
index a4109b77..4a293bdb 100644
--- a/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
+++ b/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
@@ -6,9 +6,7 @@ import { LatLng } from "leaflet";
 import { Item } from "../../../../types";
 import { toast } from "react-toastify";
 import { useHasUserPermission } from "../../hooks/usePermissions";
-import { timeAgo } from "../../../../Utils/TimeAgo";
 import { useAuth } from "../../../Auth";
-import { useEffect } from "react";
 
 
 
diff --git a/src/Components/Map/Subcomponents/ItemPopupComponents/PopupButton.tsx b/src/Components/Map/Subcomponents/ItemPopupComponents/PopupButton.tsx
index 5c3b4a98..1d317385 100644
--- a/src/Components/Map/Subcomponents/ItemPopupComponents/PopupButton.tsx
+++ b/src/Components/Map/Subcomponents/ItemPopupComponents/PopupButton.tsx
@@ -3,9 +3,9 @@ import { Link } from 'react-router-dom'
 import { getValue } from '../../../../Utils/GetValue'
 import { Item } from '../../../../types'
 
-export const PopupButton = ({url, parameterField, text, color = 'oklch(var(--p))', colorField, item} : {url: string, parameterField?: string, text: string, color? : string, colorField?: string, item? : Item}) => {
+export const PopupButton = ({url, parameterField, text, colorField, item} : {url: string, parameterField?: string, text: string, colorField?: string, item? : Item}) => {
     return (
-        <Link to={`${url}/${parameterField? getValue(item,parameterField):``}`}><button style={{backgroundColor: `${colorField? getValue(item,colorField) : color}`}} className="tw-btn tw-text-white tw-btn-sm tw-float-right -tw-mt-2">{text}</button></Link>
+        <Link to={`${url}/${parameterField? getValue(item,parameterField):``}`}><button style={{backgroundColor: `${colorField && getValue(item,colorField)? getValue(item,colorField) : item?.layer?.markerDefaultColor}`}} className="tw-btn tw-text-white tw-btn-sm tw-float-right -tw-mt-2">{text}</button></Link>
         
     )
 }
diff --git a/src/Components/Map/Subcomponents/ItemViewPopup.tsx b/src/Components/Map/Subcomponents/ItemViewPopup.tsx
index 6f5549d8..5cbbc997 100644
--- a/src/Components/Map/Subcomponents/ItemViewPopup.tsx
+++ b/src/Components/Map/Subcomponents/ItemViewPopup.tsx
@@ -42,7 +42,7 @@ export const ItemViewPopup = React.forwardRef((props: ItemViewPopupProps, ref: a
           }
 
         </div>
-        <div className='tw-flex -tw-mb-1  tw-flex-row'>
+        <div className='tw-flex -tw-mb-1 tw-flex-row-reverse tw-mr-2'>
 
 
           {
diff --git a/src/Components/Profile/ColorPicker.tsx b/src/Components/Profile/ColorPicker.tsx
index d18afb5e..49a941ab 100644
--- a/src/Components/Profile/ColorPicker.tsx
+++ b/src/Components/Profile/ColorPicker.tsx
@@ -4,7 +4,7 @@ import { HexColorPicker } from "react-colorful";
 import "./ColorPicker.css"
 import useClickOutside from "./useClickOutside";
 
-export const ColorPicker = ({ color = "#000", onChange, className }) => {
+export const ColorPicker = ({ color, onChange, className }) => {
   const popover = useRef<HTMLDivElement>(null);
   const [isOpen, toggle] = useState(false);