diff --git a/app/lish/[did]/[publication]/dashboard/settings/GeneralSettings.tsx b/app/lish/[did]/[publication]/dashboard/settings/GeneralSettings.tsx
index cd28e40c..2cb2bed2 100644
--- a/app/lish/[did]/[publication]/dashboard/settings/GeneralSettings.tsx
+++ b/app/lish/[did]/[publication]/dashboard/settings/GeneralSettings.tsx
@@ -2,6 +2,7 @@ import { useRef } from "react";
 import { Input } from "components/Input";
 import { AddTiny } from "components/Icons/AddTiny";
 import { DashboardContainer } from "./SettingsContent";
+import { EditTiny } from "components/Icons/EditTiny";
 
 export function GeneralSettings(props: {
   nameValue: string;
@@ -22,19 +23,29 @@ export function GeneralSettings(props: {
         <p className=" text-secondary  font-bold">
           Logo <span className="font-normal">(optional)</span>
         </p>
-        <div
-          className={`w-16 h-16 rounded-full flex items-center justify-center cursor-pointer  ${props.iconPreview ? "border border-border-light hover:outline-border" : "border border-dotted border-accent-contrast hover:outline-accent-contrast"} selected-outline`}
-          onClick={() => fileInputRef.current?.click()}
-        >
-          {props.iconPreview ? (
-            <img
-              src={props.iconPreview}
-              alt="Logo preview"
-              className="w-full h-full rounded-full object-cover"
-            />
-          ) : (
-            <AddTiny className="text-accent-1" />
+        <div className="relative w-fit">
+          {props.iconPreview && (
+            <div
+              className="absolute top-0 -right-1 rounded-full bg-accent-1 text-accent-2 p-1 cursor-pointer"
+              onClick={() => fileInputRef.current?.click()}
+            >
+              <EditTiny />
+            </div>
           )}
+          <div
+            className={`w-16 h-16 rounded-full flex items-center justify-center cursor-pointer  ${props.iconPreview ? "border border-border-light hover:outline-border" : "border border-dotted border-accent-contrast hover:outline-accent-contrast"} selected-outline`}
+            onClick={() => fileInputRef.current?.click()}
+          >
+            {props.iconPreview ? (
+              <img
+                src={props.iconPreview}
+                alt="Logo preview"
+                className="w-full h-full rounded-full object-cover"
+              />
+            ) : (
+              <AddTiny className="text-accent-1" />
+            )}
+          </div>
         </div>
         <input
           type="file"
diff --git a/app/lish/[did]/[publication]/dashboard/settings/SettingsContent.tsx b/app/lish/[did]/[publication]/dashboard/settings/SettingsContent.tsx
index caec3146..f7401019 100644
--- a/app/lish/[did]/[publication]/dashboard/settings/SettingsContent.tsx
+++ b/app/lish/[did]/[publication]/dashboard/settings/SettingsContent.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState, useEffect } from "react";
+import { useState, useEffect, useMemo } from "react";
 import { ButtonSecondary } from "components/Buttons";
 import { DotLoader } from "components/utils/DotLoader";
 import { useToaster } from "components/Toast";
@@ -77,6 +77,55 @@ export function SettingsContent(props: { showPageBackground: boolean }) {
       );
   }, [pubData, record]);
 
+  let hasUnsavedChanges = useMemo(() => {
+    if (!record) return false;
+    if (nameValue !== (record.name || "")) return true;
+    if (descriptionValue !== (record.description || "")) return true;
+    if (iconFile !== null) return true;
+
+    let savedShowInDiscover =
+      record.preferences?.showInDiscover === undefined
+        ? true
+        : record.preferences.showInDiscover;
+    if (showInDiscover !== savedShowInDiscover) return true;
+
+    let savedShowComments =
+      record.preferences?.showComments === undefined
+        ? true
+        : record.preferences.showComments;
+    if (showComments !== savedShowComments) return true;
+
+    let savedShowMentions =
+      record.preferences?.showMentions === undefined
+        ? true
+        : record.preferences.showMentions;
+    if (showMentions !== savedShowMentions) return true;
+
+    let savedShowRecommends =
+      record.preferences?.showRecommends === undefined
+        ? true
+        : record.preferences.showRecommends;
+    if (showRecommends !== savedShowRecommends) return true;
+
+    let savedShowPrevNext =
+      record.preferences?.showPrevNext === undefined
+        ? true
+        : record.preferences.showPrevNext;
+    if (showPrevNext !== savedShowPrevNext) return true;
+
+    return false;
+  }, [
+    record,
+    nameValue,
+    descriptionValue,
+    iconFile,
+    showInDiscover,
+    showComments,
+    showMentions,
+    showRecommends,
+    showPrevNext,
+  ]);
+
   return (
     <form
       className="flex flex-col w-full pb-8"
@@ -153,7 +202,7 @@ export function SettingsContent(props: { showPageBackground: boolean }) {
         </DashboardContainer>
         {cardBorderHidden && <div className="spacer h-4" />}
 
-        <SettingsFooter loading={loading} />
+        {hasUnsavedChanges && <SettingsFooter loading={loading} />}
       </div>
     </form>
   );