diff --git a/apps/token-manager/app/src/components/InfoBoxes.js b/apps/token-manager/app/src/components/InfoBoxes.js
index d4aad2d689..3f1e477765 100644
--- a/apps/token-manager/app/src/components/InfoBoxes.js
+++ b/apps/token-manager/app/src/components/InfoBoxes.js
@@ -113,18 +113,26 @@ function InfoBoxes({
             const isCurrentUser = addressesEqual(account, connectedAccount)
             const [label] = useIdentity(account)
 
-            const identityBadgeProps = {
-              defaultLabel: !Boolean(label) && isCurrentUser ? 'YOU' : '',
-              labelStyle: isCurrentUser ? '' + (Boolean(label) ? 'max-width: 83px;' : `color: ${theme.tagIndicatorContent};` ) : 'max-width: 117px;'
-            }
             return (
-              <div>
+              <div
+                css={`
+                  display: flex;
+                  align-items: center;
+                `}
+              >
                 <LocalIdentityBadge
                   entity={account}
                   connectedAccount={isCurrentUser}
-                  {...identityBadgeProps}
+                  defaultLabel="YOU"
+                  labelStyle={
+                    isCurrentUser && !label
+                      ? `color: ${theme.tagIndicatorContent};`
+                      : ''
+                  }
                 />
-                {isCurrentUser && Boolean(label) && <You />}
+                {isCurrentUser && Boolean(label) && (
+                  <You css="flex-shrink: 0;" />
+                )}
               </div>
             )
           }}
diff --git a/apps/token-manager/app/src/components/You.js b/apps/token-manager/app/src/components/You.js
index 947b1ed78d..7f71aecd30 100644
--- a/apps/token-manager/app/src/components/You.js
+++ b/apps/token-manager/app/src/components/You.js
@@ -1,12 +1,13 @@
 import React from 'react'
 import { Tag, GU } from '@aragon/ui'
 
-const You = () => (
+const You = props => (
   <Tag
     css={`
       margin-left: ${0.5 * GU}px;
     `}
     size="small"
+    {...props}
   >
     you
   </Tag>
diff --git a/apps/token-manager/app/src/screens/Holders.js b/apps/token-manager/app/src/screens/Holders.js
index b3f0509c06..9f6a758795 100644
--- a/apps/token-manager/app/src/screens/Holders.js
+++ b/apps/token-manager/app/src/screens/Holders.js
@@ -64,7 +64,7 @@ function Holders({
                   entity={address}
                   connectedAccount={isCurrentUser}
                 />
-                {isCurrentUser && <You />}
+                {isCurrentUser && <You css="flex-shrink: 0" />}
               </div>,
             ]