diff --git a/apps/token-manager/app/src/App.js b/apps/token-manager/app/src/App.js
index de7956a244..a04618d66e 100644
--- a/apps/token-manager/app/src/App.js
+++ b/apps/token-manager/app/src/App.js
@@ -1,19 +1,9 @@
-import React, { useEffect } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
 import BN from 'bn.js'
-import {
-  Button,
-  GU,
-  Header,
-  IconPlus,
-  Main,
-  SyncIndicator,
-  Tag,
-  textStyle,
-  useLayout,
-  useTheme,
-} from '@aragon/ui'
+import { Main, SyncIndicator } from '@aragon/ui'
 import { useAragonApi } from '@aragon/api-react'
+import AppHeader from './components/AppHeader'
 import { IdentityProvider } from './components/IdentityManager/IdentityManager'
 import UpdateTokenPanel from './components/UpdateTokenPanel/UpdateTokenPanel'
 import EmptyState from './screens/EmptyState'
@@ -97,10 +87,8 @@ class App extends React.PureComponent {
       groupMode,
       holders,
       isSyncing,
-      layoutName,
       maxAccountTokens,
       numData,
-      theme,
       tokenAddress,
       tokenDecimalsBase,
       tokenName,
@@ -123,45 +111,9 @@ class App extends React.PureComponent {
         )}
         {appStateReady && holders.length !== 0 && (
           <React.Fragment>
-            <Header
-              primary={
-                <div
-                  css={`
-                    display: flex;
-                    align-items: center;
-                    flex: 1 1 auto;
-                    width: 0;
-                  `}
-                >
-                  <h1
-                    css={`
-                      ${textStyle(
-                        layoutName === 'small' ? 'title3' : 'title2'
-                      )};
-                      flex: 0 1 auto;
-                      overflow: hidden;
-                      text-overflow: ellipsis;
-                      white-space: nowrap;
-                      margin-right: ${1 * GU}px;
-                      color: ${theme.content};
-                    `}
-                  >
-                    Tokens
-                  </h1>
-                  <div css="flex-shrink: 0">
-                    {tokenSymbol && <Tag mode="identifier">{tokenSymbol}</Tag>}
-                  </div>
-                </div>
-              }
-              secondary={
-                <Button
-                  mode="strong"
-                  onClick={this.handleLaunchAssignTokensNoHolder}
-                  label="Add tokens"
-                  icon={<IconPlus />}
-                  display={layoutName === 'small' ? 'icon' : 'label'}
-                />
-              }
+            <AppHeader
+              onAssignHolder={this.handleLaunchAssignTokensNoHolder}
+              tokenSymbol={tokenSymbol}
             />
             <Holders
               holders={holders}
@@ -200,14 +152,12 @@ class App extends React.PureComponent {
 }
 
 export default () => {
-  const theme = useTheme()
   const { api, appState, guiStyle } = useAragonApi()
-  const { layoutName } = useLayout()
   const { appearance } = guiStyle
 
   return (
     <Main assetsUrl="./aragon-ui" theme={appearance}>
-      <App api={api} layoutName={layoutName} theme={theme} {...appState} />
+      <App api={api} {...appState} />
     </Main>
   )
 }
diff --git a/apps/token-manager/app/src/components/AppHeader.js b/apps/token-manager/app/src/components/AppHeader.js
new file mode 100644
index 0000000000..637a52b06a
--- /dev/null
+++ b/apps/token-manager/app/src/components/AppHeader.js
@@ -0,0 +1,67 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import {
+  Button,
+  Header,
+  IconPlus,
+  Tag,
+  textStyle,
+  useLayout,
+  useTheme,
+  GU,
+} from '@aragon/ui'
+
+const AppHeader = React.memo(function AppHeader({
+  tokenSymbol,
+  onAssignHolder,
+}) {
+  const theme = useTheme()
+  const { layoutName } = useLayout()
+
+  return (
+    <Header
+      primary={
+        <div
+          css={`
+            display: flex;
+            align-items: center;
+            flex: 1 1 auto;
+            width: 0;
+          `}
+        >
+          <h1
+            css={`
+              ${textStyle(layoutName === 'small' ? 'title3' : 'title2')};
+              flex: 0 1 auto;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              margin-right: ${1 * GU}px;
+              color: ${theme.content};
+            `}
+          >
+            Tokens
+          </h1>
+          <div css="flex-shrink: 0">
+            {tokenSymbol && <Tag mode="identifier">{tokenSymbol}</Tag>}
+          </div>
+        </div>
+      }
+      secondary={
+        <Button
+          mode="strong"
+          onClick={onAssignHolder}
+          label="Add tokens"
+          icon={<IconPlus />}
+          display={layoutName === 'small' ? 'icon' : 'label'}
+        />
+      }
+    />
+  )
+})
+AppHeader.propTypes = {
+  onAssignHolder: PropTypes.func.isRequired,
+  tokenSymbol: PropTypes.string,
+}
+
+export default AppHeader
diff --git a/apps/token-manager/app/src/components/InfoBoxes.js b/apps/token-manager/app/src/components/InfoBoxes.js
index 03a170729a..cc9669dd99 100644
--- a/apps/token-manager/app/src/components/InfoBoxes.js
+++ b/apps/token-manager/app/src/components/InfoBoxes.js
@@ -9,10 +9,13 @@ import You from './You'
 const DISTRIBUTION_ITEMS_MAX = 7
 
 function displayedStakes(accounts, total) {
-  return stakesPercentages(accounts.map(({ balance }) => balance), {
-    total,
-    maxIncluded: DISTRIBUTION_ITEMS_MAX,
-  }).map((stake, index) => ({
+  return stakesPercentages(
+    accounts.map(({ balance }) => balance),
+    {
+      total,
+      maxIncluded: DISTRIBUTION_ITEMS_MAX,
+    }
+  ).map((stake, index) => ({
     item: stake.index === -1 ? 'Rest' : accounts[index].address,
     percentage: stake.percentage,
   }))