diff --git a/frontend/src/core/components/pageEditor/DragDropGrid.module.css b/frontend/src/core/components/pageEditor/DragDropGrid.module.css
index 96e917140..afad11777 100644
--- a/frontend/src/core/components/pageEditor/DragDropGrid.module.css
+++ b/frontend/src/core/components/pageEditor/DragDropGrid.module.css
@@ -61,7 +61,6 @@
   font-size: 14px;
   font-weight: bold;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-  z-index: 1;
 }
 
 .dragOverlayPreview {
diff --git a/frontend/src/core/components/pageEditor/PageEditor.module.css b/frontend/src/core/components/pageEditor/PageEditor.module.css
index a7f08087c..0c295a209 100644
--- a/frontend/src/core/components/pageEditor/PageEditor.module.css
+++ b/frontend/src/core/components/pageEditor/PageEditor.module.css
@@ -50,28 +50,6 @@
   transition: all 0.5s cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-.pageMoving {
-  z-index: 10;
-  transform: scale(1.05);
-  box-shadow: 0 10px 30px rgba(0,0,0,0.3);
-}
-
-/* Multi-page drag indicator */
-.multiDragIndicator {
-  position: fixed;
-  background: rgba(59, 130, 246, 0.9);
-  color: white;
-  padding: 8px 12px;
-  border-radius: 20px;
-  font-size: 12px;
-  font-weight: 600;
-  pointer-events: none;
-  z-index: 1000;
-  box-shadow: 0 4px 12px rgba(0,0,0,0.3);
-  transform: translate(-50%, -50%);
-  backdrop-filter: blur(4px);
-}
-
 /* Animations */
 @keyframes pulse {
   0%, 100% {
diff --git a/frontend/src/core/components/shared/HoverActionMenu.module.css b/frontend/src/core/components/shared/HoverActionMenu.module.css
index d4ab5086c..61d17eb40 100644
--- a/frontend/src/core/components/shared/HoverActionMenu.module.css
+++ b/frontend/src/core/components/shared/HoverActionMenu.module.css
@@ -11,7 +11,6 @@
   padding: 6px 12px;
   border-radius: 20px;
   box-shadow: var(--shadow-md);
-  z-index: 100;
   white-space: nowrap;
   pointer-events: auto;
   transition: opacity 0.2s ease-in-out;
diff --git a/frontend/src/core/components/shared/HoverActionMenu.tsx b/frontend/src/core/components/shared/HoverActionMenu.tsx
index 3c712affa..eb2304c77 100644
--- a/frontend/src/core/components/shared/HoverActionMenu.tsx
+++ b/frontend/src/core/components/shared/HoverActionMenu.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { ActionIcon, Tooltip } from '@mantine/core';
 import styles from '@app/components/shared/HoverActionMenu.module.css';
+import { Z_INDEX_HOVER_ACTION_MENU } from '@app/styles/zIndex';
 
 export interface HoverAction {
   id: string;
@@ -34,7 +35,7 @@ const HoverActionMenu: React.FC<HoverActionMenuProps> = ({
   return (
     <div
       className={`${styles.hoverMenu} ${position === 'outside' ? styles.outside : styles.inside} ${className}`}
-      style={{ opacity: show ? 1 : 0 }}
+      style={{ opacity: show ? 1 : 0, zIndex: Z_INDEX_HOVER_ACTION_MENU }}
       onMouseDown={(e) => e.stopPropagation()}
       onMouseUp={(e) => e.stopPropagation()}
       onClick={(e) => e.stopPropagation()}
diff --git a/frontend/src/core/components/shared/ToolChain.tsx b/frontend/src/core/components/shared/ToolChain.tsx
index 97a05224a..d3c25f653 100644
--- a/frontend/src/core/components/shared/ToolChain.tsx
+++ b/frontend/src/core/components/shared/ToolChain.tsx
@@ -24,10 +24,10 @@ const ToolChain: React.FC<ToolChainProps> = ({
   size = 'xs',
   color = 'var(--mantine-color-blue-7)'
 }) => {
-  const { t } = useTranslation();
-
   if (!toolChain || toolChain.length === 0) return null;
 
+  const { t } = useTranslation();
+
   const toolIds = toolChain.map(tool => tool.toolId);
 
   const getToolName = (toolId: ToolId) => {
diff --git a/frontend/src/core/components/shared/Tooltip.tsx b/frontend/src/core/components/shared/Tooltip.tsx
index 0b83657ee..cb57426ea 100644
--- a/frontend/src/core/components/shared/Tooltip.tsx
+++ b/frontend/src/core/components/shared/Tooltip.tsx
@@ -72,7 +72,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
     }
   }, []);
 
-  const sidebarContext = useSidebarContext();
+  const sidebarContext = sidebarTooltip ? useSidebarContext() : null;
 
   const isControlled = controlledOpen !== undefined;
   const open = (isControlled ? !!controlledOpen : internalOpen) && !disabled;
diff --git a/frontend/src/core/styles/zIndex.ts b/frontend/src/core/styles/zIndex.ts
index 620700503..adcb93afd 100644
--- a/frontend/src/core/styles/zIndex.ts
+++ b/frontend/src/core/styles/zIndex.ts
@@ -10,9 +10,9 @@ export const Z_INDEX_OVER_FILE_MANAGER_MODAL = 1300;
 
 export const Z_INDEX_AUTOMATE_MODAL = 1100;
 
+export const Z_INDEX_HOVER_ACTION_MENU = 100;
 export const Z_INDEX_SELECTION_BOX = 1000;
 export const Z_INDEX_DROP_INDICATOR = 1001;
 export const Z_INDEX_DRAG_BADGE = 1001;
 
 
-