diff --git a/components/IconPicker.tsx b/components/IconPicker.tsx
index a712262..f561137 100644
--- a/components/IconPicker.tsx
+++ b/components/IconPicker.tsx
@@ -8,13 +8,14 @@ import { IconWeight } from "@phosphor-icons/react";
 import IconGrid from "./IconGrid";
 
 type Props = {
-  alignment?: "left" | "right";
+  alignment?: string;
   color: string;
   setColor: Function;
   iconName?: string;
   setIconName: Function;
   weight: "light" | "regular" | "bold" | "fill" | "duotone" | "thin";
   setWeight: Function;
+  hideDefaultIcon?: boolean;
   reset: Function;
   className?: string;
 };
@@ -27,6 +28,7 @@ const IconPicker = ({
   setIconName,
   weight,
   setWeight,
+  hideDefaultIcon,
   className,
   reset,
 }: Props) => {
@@ -47,6 +49,8 @@ const IconPicker = ({
             weight={(weight || "regular") as IconWeight}
             color={color || "#0ea5e9"}
           />
+        ) : !iconName && hideDefaultIcon ? (
+          <p className="p-1">{t("set_custom_icon")}</p>
         ) : (
           <i
             className="bi-folder-fill text-6xl"
@@ -59,7 +63,8 @@ const IconPicker = ({
           onClose={() => setIconPicker(false)}
           className={
             className +
-            " fade-in bg-base-200 border border-neutral-content p-2 h-44 w-[22.5rem] rounded-lg backdrop-blur-sm bg-opacity-90 top-20 left-0 lg:-translate-x-1/3"
+            " fade-in bg-base-200 border border-neutral-content p-2 h-44 w-[22.5rem] rounded-lg backdrop-blur-sm bg-opacity-90 " +
+            (alignment || " lg:-translate-x-1/3 top-20 left-0 ")
           }
         >
           <div className="flex gap-2 h-full w-full">
diff --git a/components/LinkDetails.tsx b/components/LinkDetails.tsx
index 0b7ca14..84aabe9 100644
--- a/components/LinkDetails.tsx
+++ b/components/LinkDetails.tsx
@@ -127,7 +127,9 @@ export default function LinkDetails({ className, link }: Props) {
 
   return (
     <div className={className} data-vaul-no-drag>
-      <LinkIcon link={link} className="mx-auto" />
+      <div className="mx-auto w-fit">
+        <LinkIcon link={link} hideBackground />
+      </div>
 
       {link.name && <p className="text-xl text-center mt-2">{link.name}</p>}
 
diff --git a/components/LinkViews/LinkComponents/LinkIcon.tsx b/components/LinkViews/LinkComponents/LinkIcon.tsx
index e60c23a..2ebc530 100644
--- a/components/LinkViews/LinkComponents/LinkIcon.tsx
+++ b/components/LinkViews/LinkComponents/LinkIcon.tsx
@@ -2,34 +2,24 @@ import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 import Image from "next/image";
 import isValidUrl from "@/lib/shared/isValidUrl";
 import React from "react";
+import Icon from "@/components/Icon";
+import { IconWeight } from "@phosphor-icons/react";
+import clsx from "clsx";
 
 export default function LinkIcon({
   link,
   className,
-  size,
+  hideBackground,
 }: {
   link: LinkIncludingShortenedCollectionAndTags;
   className?: string;
-  size?: "small" | "medium";
+  hideBackground?: boolean;
 }) {
-  let iconClasses: string =
-    "bg-white shadow rounded-md border-[2px] flex item-center justify-center border-white select-none z-10 " +
-    (className || "");
-
-  let dimension;
-
-  switch (size) {
-    case "small":
-      dimension = " w-8 h-8";
-      break;
-    case "medium":
-      dimension = " w-12 h-12";
-      break;
-    default:
-      size = "medium";
-      dimension = " w-12 h-12";
-      break;
-  }
+  let iconClasses: string = clsx(
+    "rounded-md flex item-center justify-center select-none z-10 w-12 h-12",
+    !hideBackground && "bg-white backdrop-blur-lg bg-opacity-50 p-1",
+    className
+  );
 
   const url =
     isValidUrl(link.url || "") && link.url ? new URL(link.url) : undefined;
@@ -38,14 +28,22 @@ export default function LinkIcon({
 
   return (
     <>
-      {link.type === "url" && url ? (
+      {link.icon ? (
+        <Icon
+          icon={link.icon}
+          size={30}
+          weight={(link.iconWeight || "regular") as IconWeight}
+          color={link.color || "#0ea5e9"}
+          className={iconClasses}
+        />
+      ) : link.type === "url" && url ? (
         showFavicon ? (
           <Image
             src={`https://t2.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${link.url}&size=32`}
             width={64}
             height={64}
             alt=""
-            className={iconClasses + dimension}
+            className={iconClasses}
             draggable="false"
             onError={() => {
               setShowFavicon(false);
@@ -53,22 +51,22 @@ export default function LinkIcon({
           />
         ) : (
           <LinkPlaceholderIcon
-            iconClasses={iconClasses + dimension}
-            size={size}
+            iconClasses={iconClasses}
             icon="bi-link-45deg"
+            hideBackground={hideBackground}
           />
         )
       ) : link.type === "pdf" ? (
         <LinkPlaceholderIcon
-          iconClasses={iconClasses + dimension}
-          size={size}
+          iconClasses={iconClasses}
           icon="bi-file-earmark-pdf"
+          hideBackground={hideBackground}
         />
       ) : link.type === "image" ? (
         <LinkPlaceholderIcon
-          iconClasses={iconClasses + dimension}
-          size={size}
+          iconClasses={iconClasses}
           icon="bi-file-earmark-image"
+          hideBackground={hideBackground}
         />
       ) : // : link.type === "monolith" ? (
       //   <LinkPlaceholderIcon
@@ -84,20 +82,18 @@ export default function LinkIcon({
 
 const LinkPlaceholderIcon = ({
   iconClasses,
-  size,
   icon,
+  hideBackground,
 }: {
   iconClasses: string;
-  size?: "small" | "medium";
   icon: string;
+  hideBackground?: boolean;
 }) => {
   return (
-    <div
-      className={`${
-        size === "small" ? "text-2xl" : "text-4xl"
-      } text-black aspect-square ${iconClasses}`}
-    >
+    <div className={clsx(iconClasses, "aspect-square text-4xl text-[#0ea5e9]")}>
       <i className={`${icon} m-auto`}></i>
     </div>
   );
 };
+
+// `text-black aspect-square text-4xl ${iconClasses}`
diff --git a/components/LinkViews/LinkComponents/LinkList.tsx b/components/LinkViews/LinkComponents/LinkList.tsx
index 31a214b..2eddc05 100644
--- a/components/LinkViews/LinkComponents/LinkList.tsx
+++ b/components/LinkViews/LinkComponents/LinkList.tsx
@@ -111,7 +111,7 @@ export default function LinkCardCompact({
           }
         >
           <div className="shrink-0">
-            <LinkIcon link={link} className="w-12 h-12 text-4xl" />
+            <LinkIcon link={link} hideBackground />
           </div>
 
           <div className="w-[calc(100%-56px)] ml-2">
diff --git a/components/ModalContent/EditLinkModal.tsx b/components/ModalContent/EditLinkModal.tsx
index 07911f4..fa33870 100644
--- a/components/ModalContent/EditLinkModal.tsx
+++ b/components/ModalContent/EditLinkModal.tsx
@@ -9,6 +9,8 @@ import Modal from "../Modal";
 import { useTranslation } from "next-i18next";
 import { useUpdateLink } from "@/hooks/store/links";
 import toast from "react-hot-toast";
+import IconPicker from "../IconPicker";
+import { IconWeight } from "@phosphor-icons/react";
 
 type Props = {
   onClose: Function;
@@ -138,6 +140,29 @@ export default function EditLinkModal({ onClose, activeLink }: Props) {
               className="resize-none w-full rounded-md p-2 border-neutral-content bg-base-200 focus:border-sky-300 dark:focus:border-sky-600 border-solid border outline-none duration-100"
             />
           </div>
+
+          <div>
+            <IconPicker
+              hideDefaultIcon
+              color={link.color || "#0ea5e9"}
+              setColor={(color: string) => setLink({ ...link, color })}
+              weight={(link.iconWeight || "regular") as IconWeight}
+              setWeight={(iconWeight: string) =>
+                setLink({ ...link, iconWeight })
+              }
+              iconName={link.icon as string}
+              setIconName={(icon: string) => setLink({ ...link, icon })}
+              reset={() =>
+                setLink({
+                  ...link,
+                  color: "",
+                  icon: "",
+                  iconWeight: "",
+                })
+              }
+              alignment="-top-10 translate-x-20"
+            />
+          </div>
         </div>
       </div>
 
diff --git a/lib/api/controllers/links/linkId/updateLinkById.ts b/lib/api/controllers/links/linkId/updateLinkById.ts
index 306696a..53daa87 100644
--- a/lib/api/controllers/links/linkId/updateLinkById.ts
+++ b/lib/api/controllers/links/linkId/updateLinkById.ts
@@ -96,6 +96,9 @@ export default async function updateLinkById(
       data: {
         name: data.name,
         description: data.description,
+        icon: data.icon,
+        iconWeight: data.iconWeight,
+        color: data.color,
         collection: {
           connect: {
             id: data.collection.id,
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 6165806..9a9cc86 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -379,5 +379,6 @@
   "fill": "Fill",
   "duotone": "Duotone",
   "light_icon": "Light",
-  "search": "Search"
+  "search": "Search",
+  "set_custom_icon": "Set Custom Icon"
 }
\ No newline at end of file