diff --git a/src/components/Editor.css b/src/components/Editor.css
index ac5a5364..0c225dbd 100644
--- a/src/components/Editor.css
+++ b/src/components/Editor.css
@@ -179,14 +179,26 @@
   flex-shrink: 0;
 }
 
+.title-section__add-icon {
+  /* "Add icon" button above the title when no emoji — Notion-style */
+  padding-top: 24px;
+  margin-left: 8px;
+  min-height: 28px;
+}
+
 .title-section__row {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
-  padding-top: 32px;
+  padding-top: 8px;
   margin-left: 8px;
 }
 
+/* When emoji is present, restore top padding to the row itself */
+.title-section__row:has(.note-icon-button--active) {
+  padding-top: 32px;
+}
+
 .title-section__separator {
   border-bottom: 1px solid var(--border-primary, rgba(0, 0, 0, 0.08));
   margin-top: 12px;
diff --git a/src/components/EditorContent.tsx b/src/components/EditorContent.tsx
index 06081ddb..e4856157 100644
--- a/src/components/EditorContent.tsx
+++ b/src/components/EditorContent.tsx
@@ -205,13 +205,25 @@ export function EditorContent({
       {showEditor && activeTab && (
         <div className="editor-scroll-area" style={cssVars as React.CSSProperties}>
           <div className="title-section">
+            {!emojiIcon && (
+              <div className="title-section__add-icon">
+                <NoteIcon
+                  icon={null}
+                  editable={!isTrashed}
+                  onSetIcon={handleSetIcon}
+                  onRemoveIcon={handleRemoveIcon}
+                />
+              </div>
+            )}
             <div className="title-section__row">
-              <NoteIcon
-                icon={emojiIcon}
-                editable={!isTrashed}
-                onSetIcon={handleSetIcon}
-                onRemoveIcon={handleRemoveIcon}
-              />
+              {emojiIcon && (
+                <NoteIcon
+                  icon={emojiIcon}
+                  editable={!isTrashed}
+                  onSetIcon={handleSetIcon}
+                  onRemoveIcon={handleRemoveIcon}
+                />
+              )}
               <TitleField
                 title={activeTab.entry.title}
                 filename={activeTab.entry.filename}