diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js
index a86bc70e042..b64e7e56478 100644
--- a/packages/client/src/pages/Home/Section/Header/index.js
+++ b/packages/client/src/pages/Home/Section/Header/index.js
@@ -567,11 +567,6 @@ const SectionHeaderContent = (props) => {
     },
   ];
 
-  const currentIsPublicRoomType =
-    isLoading && typeof stateIsPublicRoomType === "boolean"
-      ? stateIsPublicRoomType
-      : isPublicRoomType;
-
   const isCurrentRoom =
     isLoading && typeof stateIsRoom === "boolean" ? stateIsRoom : isRoom;
 
@@ -895,7 +890,7 @@ export default inject(
     const isExternal = external || navigationPath.find((r) => r.external);
 
     const showNavigationButton =
-      isLoading || !security?.CopyLink || isPublicRoom || isArchive
+      !security?.CopyLink || isPublicRoom || isArchive
         ? false
         : security?.Read && isShared;
 
diff --git a/packages/shared/components/navigation/Navigation.tsx b/packages/shared/components/navigation/Navigation.tsx
index 119025ebc4c..1d6fd84994c 100644
--- a/packages/shared/components/navigation/Navigation.tsx
+++ b/packages/shared/components/navigation/Navigation.tsx
@@ -185,7 +185,7 @@ const Navigation = ({
 
   const navigationTitleNode = (
     <div className="title-block">
-      {titleIcon && (
+      {titleIcon && !isRootFolder && (
         <ReactSVG
           data-tooltip-id="iconTooltip"
           className="title-icon"
diff --git a/packages/shared/components/navigation/sub-components/ControlBtn.tsx b/packages/shared/components/navigation/sub-components/ControlBtn.tsx
index 00f697c0322..d2d7cd3270f 100644
--- a/packages/shared/components/navigation/sub-components/ControlBtn.tsx
+++ b/packages/shared/components/navigation/sub-components/ControlBtn.tsx
@@ -71,7 +71,7 @@ const ControlButtons = ({
   };
 
   const navigationButtonBlock =
-    navigationButtonLabel && !isFrame ? (
+    navigationButtonLabel && !isFrame && !isRootFolder ? (
       <Button
         className="navigation_button"
         label={navigationButtonLabel}