diff --git a/libs/remix-ui/workspace/src/lib/actions/workspace.ts b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
index f25827373c..a37759044e 100644
--- a/libs/remix-ui/workspace/src/lib/actions/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
@@ -488,7 +488,6 @@ export const cloneRepository = async (url: string) => {
   }
 }
 
-
 export const checkGit = async () => {
   const isGitRepo = await plugin.fileManager.isGitRepo()
   dispatch(setCurrentWorkspaceIsGitRepo(isGitRepo))
diff --git a/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx b/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
index b0976a49f2..0dc1e37fc6 100644
--- a/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
@@ -1,9 +1,6 @@
 import React from 'react'
-import { CustomTooltip } from '@remix-ui/helper'
 import { Dropdown } from 'react-bootstrap'
-import { FormattedMessage } from 'react-intl'
-
-const _paq = window._paq = window._paq || []
+import { HamburgerMenuItem } from './workspace-hamburger-item'
 
 export interface HamburgerMenuProps {
   createWorkspace: () => void,
@@ -24,326 +21,51 @@ export interface HamburgerMenuProps {
 
 export function HamburgerMenu (props: HamburgerMenuProps) {
   const { showIconsMenu, hideWorkspaceOptions, hideLocalhostOptions } = props
-      return (
-        <>
-          <Dropdown.Item>
-            <CustomTooltip
-              placement="right"
-              tooltipId="createWorkspaceTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id='filePanel.workspace.create' />}
-            >
-              <div
-                data-id='workspaceCreate'
-                onClick={() => {
-                  props.createWorkspace()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceCreate'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-                key={`workspacesCreate-fe-ws`}
-              >
-                <span
-                  hidden={hideWorkspaceOptions}
-                  id='workspaceCreate'
-                  data-id='workspaceCreate'
-                  onClick={() => {
-                    props.createWorkspace()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceCreate'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                  className='far fa-plus pl-2'
-                >
-                </span>
-                <span className="pl-3"><FormattedMessage id='filePanel.create' /></span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Item>
-            <CustomTooltip
-              placement="right-start"
-              tooltipId="createWorkspaceTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id='filePanel.workspace.delete' />}
-            >
-              <div
-                data-id='workspaceDelete'
-                onClick={() => {
-                  props.deleteCurrentWorkspace()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceDelete'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-                key={`workspacesDelete-fe-ws`}
-              >
-                <span
-                  hidden={ hideWorkspaceOptions || hideLocalhostOptions }
-                  id='workspaceDelete'
-                  data-id='workspaceDelete'
-                  onClick={() => {
-                    props.deleteCurrentWorkspace()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceDelete'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                  className='far fa-trash pl-2'
-                >
-                </span>
-                <span className="pl-3"><FormattedMessage id='filePanel.delete' /></span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Item>
-            <CustomTooltip
-              placement="right-start"
-              tooltipId="createWorkspaceTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id='filePanel.workspace.deleteAll' />}
-            >
-              <div
-                data-id='workspaceDeleteAll'
-                onClick={() => {
-                  props.deleteAllWorkspaces()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceDeleteAll'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-                key={`workspacesDeleteAll-fe-ws`}
-              >
-                <span
-                  hidden={ hideWorkspaceOptions || hideLocalhostOptions }
-                  id='workspaceDeleteAll'
-                  data-id='workspaceDeleteAll'
-                  onClick={() => {
-                    props.deleteAllWorkspaces()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceDeleteAll'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                  className='far fa-trash-alt pl-2'
-                >
-                </span>
-                <span className="pl-3"><FormattedMessage id='filePanel.deleteAll' /></span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Item>
-            <CustomTooltip
-              placement='right-start'
-              tooltipClasses="text-nowrap"
-              tooltipId="workspaceRenametooltip"
-              tooltipText={<FormattedMessage id='filePanel.workspace.rename' />}
-            >
-              <div onClick={() => {
-                  props.renameCurrentWorkspace()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceRename'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-                data-id='workspaceRename'
-                key={`workspacesRename-fe-ws`}
-              >
-                <span
-                  hidden={ hideWorkspaceOptions || hideLocalhostOptions }
-                  id='workspaceRename'
-                  data-id='workspaceRename'
-                  onClick={() => {
-                    props.renameCurrentWorkspace()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceRename'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                  className='far fa-edit pl-2'>
-                </span>
-                <span className="pl-3"><FormattedMessage id='filePanel.rename' /></span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Divider className="border mb-0 mt-0 remixui_menuhr" style={{ pointerEvents: 'none' }} />
-          <Dropdown.Item>
-            <CustomTooltip
-              placement="right-start"
-              tooltipId="cloneWorkspaceTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id='filePanel.workspace.clone' />}
-            >
-              <div
-                data-id='cloneGitRepository'
-                onClick={() => {
-                  props.cloneGitRepository()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'cloneGitRepository'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-                key={`cloneGitRepository-fe-ws`}
-              >
-                <span
-                  hidden={ hideWorkspaceOptions }
-                  id='cloneGitRepository'
-                  data-id='cloneGitRepository'
-                  onClick={() => {
-                    props.cloneGitRepository()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'cloneGitRepository'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                  className='fab fa-github pl-2'
-                >
-                </span>
-                <span className="pl-3"><FormattedMessage id='filePanel.clone' /></span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Divider className="border mt-0 mb-0 remixui_menuhr" style={{ pointerEvents: 'none' }}/>
-          <Dropdown.Item>
-            <CustomTooltip
-              placement="right-start"
-              tooltipId="createWorkspaceTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id='filePanel.workspace.download' />}
-            >
-              <div
-                data-id='workspacesDownload'
-                onClick={() => {
-                  props.downloadWorkspaces()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspacesDownload'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-                key={`workspacesDownload-fe-ws`}
-              >
-                <span
-                  hidden={ hideWorkspaceOptions || hideLocalhostOptions }
-                  id='workspacesDownload'
-                  data-id='workspacesDownload'
-                  onClick={() => {
-                    props.downloadWorkspaces()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspacesDownload'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                  className='far fa-download pl-2 '
-                >
-                </span>
-                <span className="pl-3"><FormattedMessage id='filePanel.download' /></span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Item>
-            <CustomTooltip
-              placement="right-start"
-              tooltipId="createWorkspaceTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id='filePanel.workspace.restore' />}
-            >
-              <div
-                data-id='workspacesRestore'
-                onClick={() => {
-                  props.restoreBackup()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspacesRestore'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-                key={`workspacesRestore-fe-ws`}
-              >
-                <span
-                  hidden={ hideWorkspaceOptions }
-                  id='workspacesRestore'
-                  data-id='workspacesRestore'
-                  onClick={() => {
-                    props.restoreBackup()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspacesRestore'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                  className='far fa-upload pl-2'
-                >
-                </span>
-                <span className="pl-3"><FormattedMessage id='filePanel.restore' /></span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Divider className="border mt-0 mb-0 remixui_menuhr" style={{ pointerEvents: 'none' }}/>
-          <Dropdown.Item>
-            <CustomTooltip
-              placement="right-start"
-              tooltipId="createSolGHActionTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id='filePanel.workspace.solghaction' />}
-            >
-              <div
-                data-id='soliditygithubaction'
-                onClick={() => {
-                  props.addGithubAction()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'addSolidityTesting'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-              >
-                <span
-                  hidden={ hideWorkspaceOptions }
-                  id='soliditygithubaction'
-                  data-id='soliditygithubaction'
-                  onClick={() => {
-                    props.addGithubAction()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'addSolidityTesting'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                  className='fak fa-solidity-mono pl-2'
-                >
-                </span>
-                <span className="pl-3">{<FormattedMessage id='filePanel.solghaction' />}</span>
-              </div>
-            </CustomTooltip>
-          </Dropdown.Item>
-          <Dropdown.Item>
-            <CustomTooltip
-              placement="right-start"
-              tooltipId="createTsSolTestGHActionTooltip"
-              tooltipClasses="text-nowrap"
-              tooltipText={<FormattedMessage id='filePanel.workspace.tssoltestghaction' />}
-            >
-              <div
-                data-id='typescriptsoliditygithubtestaction'
-                onClick={() => {
-                  props.addTsSolTestGithubAction()
-                  _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'addTsSolTestingAction'])
-                  props.hideIconsMenu(!showIconsMenu)
-                }}
-              >
-                  <span
-                    hidden={ hideWorkspaceOptions }
-                    id='tssoliditygithubaction'
-                    data-id='tssoliditygithubaction'
-                    onClick={() => {
-                      props.addTsSolTestGithubAction()
-                      _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'addTsSolTestingAction'])
-                      props.hideIconsMenu(!showIconsMenu)
-                    }}
-                    className='fab fa-js pl-2'
-                  >
-                  </span>
-                  <span className="pl-3">{<FormattedMessage id='filePanel.tssoltestghaction' />}</span>
-                </div>
-              </CustomTooltip>
-            </Dropdown.Item>
-            <Dropdown.Item>
-              <CustomTooltip
-                placement="right-start"
-                tooltipId="createSlitherGHActionTooltip"
-                tooltipClasses="text-nowrap"
-                tooltipText={<FormattedMessage id='filePanel.workspace.slitherghaction' />}
-              >
-                <div
-                  data-id='slithergithubtestaction'
-                  onClick={() => {
-                    props.addSlitherGithubAction()
-                    _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'addSlitherAction'])
-                    props.hideIconsMenu(!showIconsMenu)
-                  }}
-                >
-                  <span
-                    hidden={ hideWorkspaceOptions }
-                    id='slithergithubaction'
-                    data-id='slithergithubaction'
-                    onClick={() => {
-                      props.addSlitherGithubAction()
-                      _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'addSlitherAction'])
-                      props.hideIconsMenu(!showIconsMenu)
-                    }}
-                    className='far fa-shield pl-2'
-                  >
-                  </span>
-                  <span className="pl-3">{<FormattedMessage id='filePanel.slitherghaction' />}</span>
-                </div>
-              </CustomTooltip>
-            </Dropdown.Item>
-        </>
-      )
-    }
+    return (
+      <>
+        <HamburgerMenuItem kind='create' fa='far fa-plus' hideOption={hideWorkspaceOptions} actionOnClick={() => {
+          props.createWorkspace()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <HamburgerMenuItem kind='delete' fa='far fa-trash' hideOption={hideWorkspaceOptions || hideLocalhostOptions} actionOnClick={() => {
+          props.deleteCurrentWorkspace()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <HamburgerMenuItem kind='deleteAll' fa='far fa-trash-alt' hideOption={hideWorkspaceOptions || hideLocalhostOptions} actionOnClick={() => {
+          props.deleteAllWorkspaces()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <HamburgerMenuItem kind='rename' fa='far fa-edit' hideOption={hideWorkspaceOptions || hideLocalhostOptions} actionOnClick={() => {
+          props.renameCurrentWorkspace()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <Dropdown.Divider className="border mb-0 mt-0 remixui_menuhr" style={{ pointerEvents: 'none' }} />
+        <HamburgerMenuItem kind='clone' fa='fab fa-github' hideOption={hideWorkspaceOptions} actionOnClick={() => {
+          props.cloneGitRepository()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <Dropdown.Divider className="border mt-0 mb-0 remixui_menuhr" style={{ pointerEvents: 'none' }}/>
+        <HamburgerMenuItem kind='download' fa='far fa-download' hideOption={hideWorkspaceOptions || hideLocalhostOptions} actionOnClick={() => {
+          props.downloadWorkspaces()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <HamburgerMenuItem kind='restore' fa='far fa-upload' hideOption={hideWorkspaceOptions} actionOnClick={() => {
+          props.restoreBackup()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <Dropdown.Divider className="border mt-0 mb-0 remixui_menuhr" style={{ pointerEvents: 'none' }}/>
+        <HamburgerMenuItem kind='solghaction' fa='fak fa-solidity-mono' hideOption={hideWorkspaceOptions} actionOnClick={() => {
+          props.addGithubAction()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <HamburgerMenuItem kind='tssoltestghaction' fa='fab fa-js' hideOption={hideWorkspaceOptions} actionOnClick={() => {
+          props.addTsSolTestGithubAction()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+        <HamburgerMenuItem kind='slitherghaction' fa='far fa-shield' hideOption={hideWorkspaceOptions} actionOnClick={() => {
+          props.addSlitherGithubAction()
+          props.hideIconsMenu(!showIconsMenu)
+        }}></HamburgerMenuItem>
+      </>
+    )
+  }
\ No newline at end of file