diff --git a/components/LinkCard.tsx b/components/LinkCard.tsx
index 7a23d87..9add494 100644
--- a/components/LinkCard.tsx
+++ b/components/LinkCard.tsx
@@ -218,7 +218,7 @@ export default function LinkCard({ link, count, className }: Props) {
             width={64}
             height={64}
             alt=""
-            className={`absolute w-12 duration-100 bg-white shadow rounded-md p-1 bottom-5 right-5 select-none z-10`}
+            className={`absolute w-12 bg-white shadow rounded-md p-1 bottom-5 right-5 select-none z-10`}
             draggable="false"
             onError={(e) => {
               const target = e.target as HTMLElement;
@@ -250,7 +250,7 @@ export default function LinkCard({ link, count, className }: Props) {
               <p className="truncate capitalize w-full">{collection?.name}</p>
             </Link>
 
-            {/* {link.tags[0] ? (
+            {link.tags[0] ? (
               <div className="flex gap-3 items-center flex-wrap my-2 truncate relative">
                 <div className="flex gap-1 items-center flex-nowrap">
                   {link.tags.map((e, i) => (
@@ -260,15 +260,17 @@ export default function LinkCard({ link, count, className }: Props) {
                       onClick={(e) => {
                         e.stopPropagation();
                       }}
-                      className="btn btn-xs btn-outline truncate max-w-[19rem]"
+                      className="btn btn-xs btn-ghost truncate max-w-[19rem]"
                     >
-                      {e.name}
+                      #{e.name}
                     </Link>
                   ))}
                 </div>
                 <div className="absolute w-1/2 top-0 bottom-0 right-0 bg-gradient-to-r from-transparent to-base-200 to-35%"></div>
               </div>
-            ) : undefined} */}
+            ) : (
+              <p className="text-xs my-2 p-1 font-semibold italic">No Tags</p>
+            )}
 
             <Link
               href={link.url || ""}
diff --git a/components/PublicPage/PublicLinkCard.tsx b/components/PublicPage/PublicLinkCard.tsx
index 9f20a9e..b53d5fd 100644
--- a/components/PublicPage/PublicLinkCard.tsx
+++ b/components/PublicPage/PublicLinkCard.tsx
@@ -57,9 +57,9 @@ export default function LinkCard({ link, count }: Props) {
                 <Link
                   href={"/public/collections/20?q=" + e.name}
                   key={i}
-                  className="btn btn-xs btn-outline truncate max-w-[19rem]"
+                  className="btn btn-xs btn-ghost truncate max-w-[19rem]"
                 >
-                  {e.name}
+                  #{e.name}
                 </Link>
               ))}
             </div>
diff --git a/pages/links/[id].tsx b/pages/links/[id].tsx
index b7200a0..0a991e1 100644
--- a/pages/links/[id].tsx
+++ b/pages/links/[id].tsx
@@ -165,7 +165,7 @@ export default function Index() {
                   height={42}
                   alt=""
                   id={"favicon-" + link.id}
-                  className="select-none mt-2 w-10 rounded-md shadow border-[3px] border-base-100 bg-base-100 aspect-square"
+                  className="bg-white shadow rounded-md p-1 bottom-5 right-5 select-none"
                   draggable="false"
                   onLoad={(e) => {
                     try {
@@ -239,9 +239,9 @@ export default function Index() {
                   <Link key={i} href={`/tags/${e.id}`} className="z-10">
                     <p
                       title={e.name}
-                      className="btn btn-xs btn-outline truncate max-w-[19rem]"
+                      className="btn btn-xs btn-ghost truncate max-w-[19rem]"
                     >
-                      {e.name}
+                      #{e.name}
                     </p>
                   </Link>
                 ))}
diff --git a/pages/public/links/[id].tsx b/pages/public/links/[id].tsx
index 2dc6268..918f4dd 100644
--- a/pages/public/links/[id].tsx
+++ b/pages/public/links/[id].tsx
@@ -239,14 +239,10 @@ export default function Index() {
                   <Link
                     key={i}
                     href={"/public/collections/20?q=" + e.name}
-                    className="z-10"
+                    title={e.name}
+                    className="z-10 btn btn-xs btn-ghost truncate max-w-[19rem]"
                   >
-                    <p
-                      title={e.name}
-                      className="btn btn-xs btn-outline truncate max-w-[19rem]"
-                    >
-                      {e.name}
-                    </p>
+                    #{e.name}
                   </Link>
                 ))}
               </div>