diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
index d0b66f29..cb9562d1 100644
--- a/src/components/Footer/index.js
+++ b/src/components/Footer/index.js
@@ -18,7 +18,7 @@ const Wrapper = styled.div`
     display: flex;
 `;
 
-const LinkWrapper = styled(Link)`
+const StyledLink = styled(Link)`
     margin: 0 6px;
     margin-right: 20px;
 `;
@@ -30,9 +30,9 @@ const Copy = styled.div`
 const Footer = ({ toggle }) => (
     <Wrapper>
         <Copy>&copy; {getYear(new Date())}</Copy>
-        <LinkWrapper href="http://satoshilabs.com" target="_blank" rel="noreferrer noopener" className="satoshi" isGreen>SatoshiLabs</LinkWrapper>
-        <LinkWrapper href="tos.pdf" target="_blank" rel="noreferrer noopener" isGreen>Terms</LinkWrapper>
-        <LinkWrapper onClick={toggle} isGreen>Show Log</LinkWrapper>
+        <StyledLink href="http://satoshilabs.com" target="_blank" rel="noreferrer noopener" className="satoshi" isGreen>SatoshiLabs</StyledLink>
+        <StyledLink href="tos.pdf" target="_blank" rel="noreferrer noopener" isGreen>Terms</StyledLink>
+        <StyledLink onClick={toggle} isGreen>Show Log</StyledLink>
     </Wrapper>
 );
 
diff --git a/src/components/Header/index.js b/src/components/Header/index.js
index b64301c5..12d9b0fa 100644
--- a/src/components/Header/index.js
+++ b/src/components/Header/index.js
@@ -1,5 +1,6 @@
 /* @flow */
 import React from 'react';
+import Link from 'components/Link';
 import styled from 'styled-components';
 
 import colors from 'config/colors';
@@ -32,7 +33,7 @@ const LayoutWrapper = styled.div`
     }
 `;
 
-const A = styled.a`
+const A = styled(Link)`
     color: ${colors.WHITE};
     margin-left: 24px;
 
diff --git a/src/components/modals/index.js b/src/components/modals/index.js
index 4ad88240..e62094b7 100644
--- a/src/components/modals/index.js
+++ b/src/components/modals/index.js
@@ -90,9 +90,7 @@ class Modal extends Component<Props> {
     render() {
         if (!this.props.modal.opened) return null;
 
-        const { opened } = this.props.modal;
-
-        const windowType = UI.REQUEST_PIN;
+        const { opened, windowType } = this.props.modal;
 
         let component = null;
         switch (windowType) {