diff --git a/apps/client/src/components/layouts/dashboard/header.tsx b/apps/client/src/components/layouts/dashboard/header.tsx
index bdf4012..9d37a2c 100644
--- a/apps/client/src/components/layouts/dashboard/header.tsx
+++ b/apps/client/src/components/layouts/dashboard/header.tsx
@@ -1,4 +1,4 @@
-import { ActionIcon, Menu, Button } from "@mantine/core";
+import { ActionIcon, Menu, Button, Tooltip } from "@mantine/core";
 import {
   IconDots,
   IconFileInfo,
@@ -19,17 +19,21 @@ export default function Header() {
 
   return (
     <>
+      {/*
       <Button variant="default" style={{ border: "none" }} size="compact-sm">
         Share
       </Button>
+      */}
 
-      <ActionIcon
-        variant="default"
-        style={{ border: "none" }}
-        onClick={() => toggleAside("comments")}
-      >
-        <IconMessage size={20} stroke={2} />
-      </ActionIcon>
+      <Tooltip label="Comments" openDelay={250} withArrow>
+        <ActionIcon
+          variant="default"
+          style={{ border: "none" }}
+          onClick={() => toggleAside("comments")}
+        >
+          <IconMessage size={20} stroke={2} />
+        </ActionIcon>
+      </Tooltip>
 
       <PageActionMenu />
     </>
@@ -59,15 +63,9 @@ function PageActionMenu() {
       </Menu.Target>
 
       <Menu.Dropdown>
-        <Menu.Item leftSection={<IconFileInfo size={16} stroke={2} />}>
-          Page info
-        </Menu.Item>
         <Menu.Item leftSection={<IconLink size={16} stroke={2} />}>
           Copy link
         </Menu.Item>
-        <Menu.Item leftSection={<IconShare size={16} stroke={2} />}>
-          Share
-        </Menu.Item>
         <Menu.Item
           leftSection={<IconHistory size={16} stroke={2} />}
           onClick={openHistoryModal}
@@ -76,9 +74,6 @@ function PageActionMenu() {
         </Menu.Item>
 
         <Menu.Divider />
-        <Menu.Item leftSection={<IconLock size={16} stroke={2} />}>
-          Lock
-        </Menu.Item>
         <Menu.Item leftSection={<IconTrash size={16} stroke={2} />}>
           Delete
         </Menu.Item>
diff --git a/apps/client/src/features/home/components/home-tabs.tsx b/apps/client/src/features/home/components/home-tabs.tsx
index 90ff2d5..3c5a9c2 100644
--- a/apps/client/src/features/home/components/home-tabs.tsx
+++ b/apps/client/src/features/home/components/home-tabs.tsx
@@ -11,22 +11,13 @@ export default function HomeTabs() {
             Recent changes
           </Text>
         </Tabs.Tab>
-
-        <Tabs.Tab value="favorites" leftSection={<IconStar size={18} />}>
-          <Text size="sm" fw={500}>
-            Favorites
-          </Text>
-        </Tabs.Tab>
       </Tabs.List>
 
       <Space my="md" />
 
       <Tabs.Panel value="recent">
         <div>Recent</div>
-        {/*  <RecentChanges /> */}
       </Tabs.Panel>
-
-      <Tabs.Panel value="favorites">My favorite pages</Tabs.Panel>
     </Tabs>
   );
 }
diff --git a/apps/client/src/features/page/tree/components/space-tree.tsx b/apps/client/src/features/page/tree/components/space-tree.tsx
index 384669b..264ea8b 100644
--- a/apps/client/src/features/page/tree/components/space-tree.tsx
+++ b/apps/client/src/features/page/tree/components/space-tree.tsx
@@ -386,16 +386,6 @@ function NodeMenu({ node, treeApi }: NodeMenuProps) {
       </Menu.Target>
 
       <Menu.Dropdown>
-        <Menu.Item
-          leftSection={<IconStar style={{ width: rem(14), height: rem(14) }} />}
-          onClick={(e) => {
-            e.preventDefault();
-            e.stopPropagation();
-          }}
-        >
-          Favorite
-        </Menu.Item>
-
         <Menu.Divider />
 
         <Menu.Item