diff --git a/app/components/Sidebar/Settings.js b/app/components/Sidebar/Settings.js
index 2022e52c..db92804b 100644
--- a/app/components/Sidebar/Settings.js
+++ b/app/components/Sidebar/Settings.js
@@ -29,7 +29,7 @@ class SettingsSidebar extends React.Component<Props> {
     return (
       <Sidebar>
         <HeaderBlock
-          subheading="◄ Return to Dashboard"
+          subheading="◄ Return to App"
           teamName={team.name}
           logoUrl={team.avatarUrl}
           onClick={this.returnToDashboard}
diff --git a/app/components/Sidebar/components/HeaderBlock.js b/app/components/Sidebar/components/HeaderBlock.js
index 0d9f416f..dfde6419 100644
--- a/app/components/Sidebar/components/HeaderBlock.js
+++ b/app/components/Sidebar/components/HeaderBlock.js
@@ -35,9 +35,9 @@ function HeaderBlock({
 }
 
 const StyledExpandedIcon = styled(ExpandedIcon)`
-  position: relative;
-  top: 6px;
-  left: -4px;
+  position: absolute;
+  right: 0;
+  top: 0;
 `;
 
 const Subheading = styled.div`
@@ -49,8 +49,9 @@ const Subheading = styled.div`
 `;
 
 const TeamName = styled.div`
+  position: relative;
   padding-left: 10px;
-  margin-top: ${props => (props.showDisclosure ? '-8px' : '0')};
+  padding-right: 24px;
   font-weight: 600;
   color: ${color.text};
   text-decoration: none;
diff --git a/app/components/Sidebar/components/SidebarLink.js b/app/components/Sidebar/components/SidebarLink.js
index 5e9219bc..8e1ea6cc 100644
--- a/app/components/Sidebar/components/SidebarLink.js
+++ b/app/components/Sidebar/components/SidebarLink.js
@@ -59,7 +59,6 @@ type Props = {
   active?: boolean,
 };
 
-@withRouter
 @observer
 class SidebarLink extends React.Component<Props> {
   @observable expanded: boolean = false;
@@ -158,4 +157,4 @@ const Content = styled.div`
   width: 100%;
 `;
 
-export default SidebarLink;
+export default withRouter(SidebarLink);