diff --git a/app/templates/base.html b/app/templates/base.html
index cefa657..ba97d8a 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -494,7 +494,7 @@
         <span class="menu-shortcut">▶</span>
       </div>
       <div class="context-menu-item" @click="contextAction('rename')">
-        <span class="menu-icon">✏️</span> Rename
+        <span class="menu-icon">{{ fd_icon("edit",14) }}</span> Rename
         <span class="menu-shortcut">Ctrl+Shift+R</span>
       </div>
       <div class="context-menu-item" @click="contextAction('moveTo')">
@@ -502,7 +502,7 @@
         <span class="menu-shortcut">Ctrl+Shift+P</span>
       </div>
       <div class="context-menu-item" @click="contextAction('delete')">
-        <span class="menu-icon">🗑️</span> Move to Trash
+        <span class="menu-icon">{{ fd_icon("trash",14) }}</span> Move to Trash
       </div>
     </div>
     <div class="context-menu-section">
@@ -536,19 +536,19 @@
     <template x-if="wsCtx.isFolder">
       <div class="context-menu-section">
         <div class="context-menu-item" onclick="window.FlowDeck.createPage()">
-          <span class="menu-icon">📄</span> New File
+          <span class="menu-icon">{{ fd_icon("file",14) }}</span> New File
         </div>
         <div class="context-menu-item" onclick="window.FlowDeck.showCreateFolderModal()">
-          <span class="menu-icon">📁</span> New Folder
+          <span class="menu-icon">{{ fd_icon("folder",14) }}</span> New Folder
         </div>
       </div>
     </template>
     <div class="context-menu-section">
       <div class="context-menu-item" @click="wsCtxAction('rename')">
-        <span class="menu-icon">✏️</span> Rename
+        <span class="menu-icon">{{ fd_icon("edit",14) }}</span> Rename
       </div>
       <div class="context-menu-item" @click="wsCtxAction('delete')">
-        <span class="menu-icon">🗑</span> Delete
+        <span class="menu-icon">{{ fd_icon("trash",14) }}</span> Delete
       </div>
     </div>
     <div class="context-menu-section">
@@ -817,7 +817,7 @@
       workspaceName: '{{ workspace_name }}',
       workspaceInitial: '{{ workspace_initial }}',
       currentPage: '{{ current_page }}',
-      pageIcon: '{% block page_icon %}📁{% endblock %}',
+      pageIcon: '{% block page_icon %}folder{% endblock %}',
       pageTitle: '{% block page_title %}FlowDeck{% endblock %}',
       lastEdited: '{{ last_edited }}',
       workspaceKey: '{{ workspace_key }}',
@@ -1561,7 +1561,7 @@
 <div id="fd-global-folder-modal" class="flowdeck-modal-overlay" style="display:none" onclick="if(event.target===this)this.style.display='none'">
   <div class="flowdeck-modal">
     <div class="flowdeck-modal-header">
-      <h3>📁 New Folder</h3>
+      <h3>{{ fd_icon("folder",16) }} New Folder</h3>
       <button class="flowdeck-modal-close" onclick="document.getElementById('fd-global-folder-modal').style.display='none'">&times;</button>
     </div>
     <div class="flowdeck-modal-body">
diff --git a/app/templates/local_workspace.html b/app/templates/local_workspace.html
index 25d741a..5d8a37c 100644
--- a/app/templates/local_workspace.html
+++ b/app/templates/local_workspace.html
@@ -2207,7 +2207,7 @@ console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(wind
     <button class="filter-chip" :class="{ active: filterType === 'image' }" @click="filterByType('image')" title="Images" x-html="getSvgIcon('image',14)"></button>
     <button class="filter-chip" :class="{ active: filterType === 'code' }" @click="filterByType('code')" title="Code" x-html="getSvgIcon('file',14)"></button>
     <button class="filter-chip" :class="{ active: filterType === 'text' }" @click="filterByType('text')" title="Text" x-html="getSvgIcon('file',14)"></button>
-    <span x-show="filterType || searchQuery" class="filter-clear" @click="filterType='', searchQuery='', doFilter()">✕ clear</span>
+    <span x-show="filterType || searchQuery" class="filter-clear" @click="filterType='', searchQuery='', doFilter()">clear</span>
   </div>
 
   <ul class="ws-tree" x-show="viewMode==='tree' && (displayTree.length>0 || (currentFolder > 0))" @click="handleTreeAction($event)">
@@ -2321,7 +2321,7 @@ console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(wind
         <span style="font-size:10px;opacity:.7" x-text="'('+t.count+')'"></span>
       </button>
     </template>
-    <button x-show="tagFilter" class="tag-chip rm-btn" @click="tagFilter='', doFilter()" style="margin-left:4px;">✕ clear</button>
+    <button x-show="tagFilter" class="tag-chip rm-btn" @click="tagFilter='', doFilter()" style="margin-left:4px;">clear</button>
   </div>
 
   <!-- Filter table (shown when search/filter/tag is active) -->
@@ -2544,7 +2544,7 @@ console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(wind
   <!-- Rename Modal -->
   <div class="modal-overlay" x-show="showRename" @click.outside="showRename=false" @keydown.escape="showRename=false" style="display:none">
     <div class="modal-box">
-      <h3>✏️ Rename</h3>
+      <h3>{{ fd_icon("edit",14) }} Rename</h3>
       <p class="modal-sub">Rename <strong x-text="target?.name"></strong></p>
       <input class="modal-input" x-model="newName" @keydown.enter="doRename" x-ref="rinp">
       <div class="modal-actions">
diff --git a/app/templates/workspaces.html b/app/templates/workspaces.html
index 9e30623..ed52d65 100644
--- a/app/templates/workspaces.html
+++ b/app/templates/workspaces.html
@@ -1,11 +1,11 @@
 {% extends "base.html" %}
 {% block page_title %}Workspaces{% endblock %}
 {% block title_prefix %}Workspaces{% endblock %}
-{% block page_icon %}🏠{% endblock %}
+{% block page_icon %}{{ fd_icon("home",18) }}{% endblock %}
 
 {% block topbar %}
 {% set breadcrumb_items = [{"label": "Workspaces", "url": None}] %}
-{% set page_icon = "🏠" %}
+{% set page_icon = "home" %}
 {% set right_actions = '<a href="/auth/login?provider=local" class="topbar-btn" title="Login">🔑</a><a href="/accounts/settings" class="topbar-btn" title="Settings">⚙</a>' %}
 {% include '_header.html' %}
 {% endblock %}
@@ -51,7 +51,7 @@
 <div class="ws-page" x-data="workspacesPage()">
 
   <div class="ws-header">
-    <h1>🏠 Workspaces</h1>
+    <h1>{{ fd_icon("home",20) }} Workspaces</h1>
   </div>
 
   <!-- ── Local Workspaces ── -->