diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderMainRow.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderMainRow.tsx
deleted file mode 100644
index a764fdfd8e12..000000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderMainRow.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-
-import { Flex } from '../../../layout';
-
-export const HeaderMainRow = styled(Flex).attrs({
-  $justifyContent: 'space-between',
-  $alignItems: '  center',
-})({
-  minHeight: '38px',
-  height: '38px',
-});
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderSubRow.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderSubRow.tsx
deleted file mode 100644
index 4e5896a26ad7..000000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/HeaderSubRow.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import styled from 'styled-components';
-
-import { Spacings } from '../../../../foundations';
-import { Flex } from '../../../layout';
-
-export const HeaderSubRow = styled(Flex).attrs({
-  $flex: 1,
-  $alignItems: 'flex-end',
-  $gap: Spacings.spacing6,
-})({
-  minHeight: '18px',
-});
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/index.ts
deleted file mode 100644
index 22215abc576c..000000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './HeaderMainRow';
-export * from './HeaderSubRow';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/index.ts
deleted file mode 100644
index 266dec8a1bcd..000000000000
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Header';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
index ff83ea947f41..5b82330cdf9d 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
@@ -1,2 +1,2 @@
-export * from './header';
+export * from './main-header';
 export * from './navigation-header';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/Header.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/MainHeader.tsx
similarity index 79%
rename from desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/Header.tsx
rename to desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/MainHeader.tsx
index 1dbfee5b82fe..b3cf54c9d200 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/header/Header.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/MainHeader.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 import { Colors, Spacings } from '../../../foundations';
 import { TransientProps } from '../../../types';
 import { Flex } from '../../layout';
-import { HeaderMainRow, HeaderSubRow } from './components';
+import { MainHeaderIconButton } from './components';
 
 export type HeaderProps = React.PropsWithChildren<{
   size?: '1' | '2';
@@ -31,7 +31,7 @@ const StyledHeader = styled.header<TransientProps<HeaderProps>>(
   }),
 );
 
-const Header = ({ size = '1', variant = 'default', children, ...props }: HeaderProps) => {
+const MainHeader = ({ size = '1', variant = 'default', children, ...props }: HeaderProps) => {
   return (
     <StyledHeader $size={size} $variant={variant} {...props}>
       <Flex
@@ -48,9 +48,8 @@ const Header = ({ size = '1', variant = 'default', children, ...props }: HeaderP
   );
 };
 
-const HeaderNamespace = Object.assign(Header, {
-  MainRow: HeaderMainRow,
-  SubRow: HeaderSubRow,
+const MainHeaderNamespace = Object.assign(MainHeader, {
+  IconButton: MainHeaderIconButton,
 });
 
-export { HeaderNamespace as Header };
+export { MainHeaderNamespace as MainHeader };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx
new file mode 100644
index 000000000000..907f48cb0038
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/MainHeaderIconButton.tsx
@@ -0,0 +1,5 @@
+import { IconButton, IconButtonProps } from '../../../molecules';
+
+export const MainHeaderIconButton = (props: IconButtonProps) => {
+  return <IconButton variant="secondary" {...props} />;
+};
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts
new file mode 100644
index 000000000000..4d837fe571ab
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/components/index.ts
@@ -0,0 +1 @@
+export * from './MainHeaderIconButton';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts
new file mode 100644
index 000000000000..3d8a1927af28
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/main-header/index.ts
@@ -0,0 +1 @@
+export * from './MainHeader';