diff --git a/frontend/src/pages/APIKeys.tsx b/frontend/src/pages/APIKeys.tsx
index 94d9f1c..bc163fe 100644
--- a/frontend/src/pages/APIKeys.tsx
+++ b/frontend/src/pages/APIKeys.tsx
@@ -94,7 +94,6 @@ export default function APIKeys() {
             <span className="material-symbols-outlined">menu</span>
           </button>
           <div className="page-title-section">
-            <span className="material-symbols-outlined">vpn_key</span>
             <span className="page-title-text">{t.apiKeysPage.title}</span>
           </div>
         </div>
diff --git a/frontend/src/pages/AdminPanel.tsx b/frontend/src/pages/AdminPanel.tsx
index e0a1840..8d80710 100644
--- a/frontend/src/pages/AdminPanel.tsx
+++ b/frontend/src/pages/AdminPanel.tsx
@@ -26,7 +26,6 @@ export default function AdminPanel({ initialTab = 'general' }: { initialTab?: Ta
                         <span className="material-symbols-outlined">menu</span>
                     </button>
                     <div className="page-title-section">
-                        <span className="material-symbols-outlined">admin_panel_settings</span>
                         <span className="page-title-text">{t.admin.panel}</span>
                     </div>
                     <div className="page-tabs-divider"></div>
diff --git a/frontend/src/pages/Dashboard.tsx b/frontend/src/pages/Dashboard.tsx
index ecf2bfb..928ff15 100644
--- a/frontend/src/pages/Dashboard.tsx
+++ b/frontend/src/pages/Dashboard.tsx
@@ -13,7 +13,6 @@ export default function Dashboard() {
             <span className="material-symbols-outlined">menu</span>
           </button>
           <div className="page-title-section">
-            <span className="material-symbols-outlined">dashboard</span>
             <span className="page-title-text">{t.dashboard.title}</span>
           </div>
         </div>
diff --git a/frontend/src/pages/Feature1.tsx b/frontend/src/pages/Feature1.tsx
index a35d71f..d844055 100644
--- a/frontend/src/pages/Feature1.tsx
+++ b/frontend/src/pages/Feature1.tsx
@@ -14,7 +14,6 @@ export default function Feature1() {
                         <span className="material-symbols-outlined">menu</span>
                     </button>
                     <div className="page-title-section">
-                        <span className="material-symbols-outlined">playlist_play</span>
                         <span className="page-title-text">{t.feature1.title}</span>
                     </div>
                 </div>
diff --git a/frontend/src/pages/Feature2.tsx b/frontend/src/pages/Feature2.tsx
index 20b2567..88ec747 100644
--- a/frontend/src/pages/Feature2.tsx
+++ b/frontend/src/pages/Feature2.tsx
@@ -14,7 +14,6 @@ export default function Feature2() {
             <span className="material-symbols-outlined">menu</span>
           </button>
           <div className="page-title-section">
-            <span className="material-symbols-outlined">download</span>
             <span className="page-title-text">{t.features.feature2}</span>
           </div>
         </div>
diff --git a/frontend/src/pages/Feature3.tsx b/frontend/src/pages/Feature3.tsx
index 0d16b7e..2920b32 100644
--- a/frontend/src/pages/Feature3.tsx
+++ b/frontend/src/pages/Feature3.tsx
@@ -14,7 +14,6 @@ export default function Feature3() {
             <span className="material-symbols-outlined">menu</span>
           </button>
           <div className="page-title-section">
-            <span className="material-symbols-outlined">cast</span>
             <span className="page-title-text">{t.features.feature3}</span>
           </div>
         </div>
diff --git a/frontend/src/pages/Notifications.tsx b/frontend/src/pages/Notifications.tsx
index f6aa2cc..1994eb9 100644
--- a/frontend/src/pages/Notifications.tsx
+++ b/frontend/src/pages/Notifications.tsx
@@ -100,7 +100,6 @@ export default function Notifications() {
             <span className="material-symbols-outlined">menu</span>
           </button>
           <div className="page-title-section">
-            <span className="material-symbols-outlined">notifications</span>
             <span className="page-title-text">{t.notificationsPage.title}</span>
           </div>
         </div>
diff --git a/frontend/src/pages/Settings.tsx b/frontend/src/pages/Settings.tsx
index 7edc54b..81a2b76 100644
--- a/frontend/src/pages/Settings.tsx
+++ b/frontend/src/pages/Settings.tsx
@@ -157,7 +157,6 @@ export default function Settings() {
                         <span className="material-symbols-outlined">menu</span>
                     </button>
                     <div className="page-title-section">
-                        <span className="material-symbols-outlined">settings</span>
                         <span className="page-title-text">{t.settings.title}</span>
                     </div>
                 </div>
diff --git a/frontend/src/pages/Users.tsx b/frontend/src/pages/Users.tsx
index f559201..a582068 100644
--- a/frontend/src/pages/Users.tsx
+++ b/frontend/src/pages/Users.tsx
@@ -186,7 +186,6 @@ export default function Users() {
               <span className="material-symbols-outlined">menu</span>
             </button>
             <div className="page-title-section">
-              <span className="material-symbols-outlined">group</span>
               <span className="page-title-text">{t.admin.userManagement}</span>
             </div>
             <button className="btn-primary add-user-btn" onClick={openCreateModal}>
diff --git a/frontend/src/pages/admin/Analytics.tsx b/frontend/src/pages/admin/Analytics.tsx
index 5ed8d54..8ac0597 100644
--- a/frontend/src/pages/admin/Analytics.tsx
+++ b/frontend/src/pages/admin/Analytics.tsx
@@ -51,7 +51,6 @@ export default function Analytics() {
             <span className="material-symbols-outlined">menu</span>
           </button>
           <div className="page-title-section">
-            <span className="material-symbols-outlined">analytics</span>
             <span className="page-title-text">{t.analyticsPage.title}</span>
           </div>
         </div>
diff --git a/frontend/src/pages/admin/AuditLogs.tsx b/frontend/src/pages/admin/AuditLogs.tsx
index b90cf12..62916e6 100644
--- a/frontend/src/pages/admin/AuditLogs.tsx
+++ b/frontend/src/pages/admin/AuditLogs.tsx
@@ -64,7 +64,6 @@ export default function AuditLogs() {
             <span className="material-symbols-outlined">menu</span>
           </button>
           <div className="page-title-section">
-            <span className="material-symbols-outlined">history</span>
             <span className="page-title-text">{t.auditPage.title}</span>
           </div>
         </div>
diff --git a/frontend/src/pages/admin/Features.tsx b/frontend/src/pages/admin/Features.tsx
index 9dd2aec..6fe5115 100644
--- a/frontend/src/pages/admin/Features.tsx
+++ b/frontend/src/pages/admin/Features.tsx
@@ -245,12 +245,14 @@ export default function Features() {
         } catch (error) {
             console.error('Failed to save order:', error);
         } finally {
+            setDraggedItem(null); // Reset drag state
             isUserEditing.current = false;
             setHasOrderChanges(false);
         }
     };
 
     const handleCancelOrder = () => {
+        setDraggedItem(null); // Reset drag state
         isUserEditing.current = false; // Done editing
         setLocalOrder(moduleOrder);
         // Reset positions from moduleStates
@@ -470,7 +472,6 @@ export default function Features() {
                         <span className="material-symbols-outlined">menu</span>
                     </button>
                     <div className="page-title-section">
-                        <span className="material-symbols-outlined">extension</span>
                         <span className="page-title-text">{t.featuresPage.title}</span>
                     </div>
                     <div className="page-tabs-divider"></div>
diff --git a/frontend/src/pages/admin/Settings.tsx b/frontend/src/pages/admin/Settings.tsx
index b4dfaa9..cd19f16 100644
--- a/frontend/src/pages/admin/Settings.tsx
+++ b/frontend/src/pages/admin/Settings.tsx
@@ -65,7 +65,6 @@ export default function Settings() {
                             <span className="material-symbols-outlined">menu</span>
                         </button>
                         <div className="page-title-section">
-                            <span className="material-symbols-outlined">settings</span>
                             <span className="page-title-text">{t.settings.title}</span>
                         </div>
                     </div>
diff --git a/frontend/src/pages/admin/ThemeSettings.tsx b/frontend/src/pages/admin/ThemeSettings.tsx
index 9a8e302..9ecb36e 100644
--- a/frontend/src/pages/admin/ThemeSettings.tsx
+++ b/frontend/src/pages/admin/ThemeSettings.tsx
@@ -280,7 +280,6 @@ export default function ThemeSettings() {
                         <span className="material-symbols-outlined">menu</span>
                     </button>
                     <div className="page-title-section">
-                        <span className="material-symbols-outlined">brush</span>
                         <span className="page-title-text">{t.theme.title}</span>
                     </div>
                     <div className="admin-tabs-divider"></div>
diff --git a/frontend/src/styles/Layout.css b/frontend/src/styles/Layout.css
index 457e5ae..2137fa3 100644
--- a/frontend/src/styles/Layout.css
+++ b/frontend/src/styles/Layout.css
@@ -272,6 +272,12 @@ body {
   width: 100%;
 }
 
+/* Remove double padding when theme-tab-content is nested inside admin-tab-content */
+.admin-tab-content .theme-tab-content {
+  padding: 0;
+  max-width: none;
+}
+
 /* ==========  RESPONSIVE DESIGN ========== */
 
 /* Tablet - reduce padding */