diff --git a/packages/app/src/app/pages/Sandbox/Editor/Header/Header.tsx b/packages/app/src/app/pages/Sandbox/Editor/Header/Header.tsx
index beb3113f86b..c15b67081d5 100644
--- a/packages/app/src/app/pages/Sandbox/Editor/Header/Header.tsx
+++ b/packages/app/src/app/pages/Sandbox/Editor/Header/Header.tsx
@@ -1,7 +1,7 @@
 import { dashboardUrl } from '@codesandbox/common/lib/utils/url-generator';
-import { useOvermind } from 'app/overmind';
-import React from 'react';
+import React, { ComponentProps, FunctionComponent } from 'react';
 
+import { useOvermind } from 'app/overmind';
 import { UserMenu } from 'app/pages/common/UserMenu';
 
 import {
@@ -29,18 +29,18 @@ import {
 import { Logo } from './Logo';
 import { MenuBar } from './MenuBar';
 import { SandboxName } from './SandboxName';
-import { IHeaderProps } from './types';
 
-export const Header: React.FC<IHeaderProps> = ({ zenMode }) => {
+type Props = Pick<ComponentProps<typeof Container>, 'zenMode'>;
+export const Header: FunctionComponent<Props> = ({ zenMode }) => {
   const {
     state: {
+      hasLogIn,
+      isLoggedIn,
+      isPatron,
       preferences: {
         settings: { experimentVSCode: vscode },
       },
-      isPatron,
       updateStatus,
-      hasLogIn,
-      isLoggedIn,
       user,
     },
   } = useOvermind();
@@ -65,13 +65,21 @@ export const Header: React.FC<IHeaderProps> = ({ zenMode }) => {
 
       <Right>
         {updateStatus === 'available' && <RefreshButton />}
-        {!isLoggedIn || (!isPatron && <PatronButton />)}
+
+        {!(isLoggedIn && isPatron) && <PatronButton />}
+
         {!isLoggedIn && <PreferencesButton />}
+
         <NewSandboxButton />
+
         {isLoggedIn && <LikeButton />}
+
         {user && user.curatorAt && <PickButton />}
+
         <ShareButton />
+
         <ForkButton />
+
         <AccountContainer>
           {isLoggedIn ? (
             <UserMenuContainer>
diff --git a/packages/app/src/app/pages/Sandbox/Editor/Header/types.ts b/packages/app/src/app/pages/Sandbox/Editor/Header/types.ts
deleted file mode 100644
index eef59015dca..00000000000
--- a/packages/app/src/app/pages/Sandbox/Editor/Header/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface IHeaderProps {
-  zenMode: boolean;
-}