diff --git a/stylesheets/_session_signin.scss b/stylesheets/_session_signin.scss
index ff4661816..6eb6a0718 100644
--- a/stylesheets/_session_signin.scss
+++ b/stylesheets/_session_signin.scss
@@ -126,6 +126,10 @@
     }
   }
 
+  &-input-floating-label-show-hide {
+    padding-right: 20px;
+  }
+
   &-input-with-label-container {
     height: 46.5px;
     width: 280px;
@@ -170,7 +174,7 @@
       bottom: 0px;
     }
 
-    button {
+    .session-icon-button {
       position: absolute;
       top: 50%;
       transform: translateY(-50%);
diff --git a/ts/components/session/SessionInput.tsx b/ts/components/session/SessionInput.tsx
index d858f7eab..e8f18575d 100644
--- a/ts/components/session/SessionInput.tsx
+++ b/ts/components/session/SessionInput.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import classNames from 'classnames';
+import { SessionIconButton, SessionIconSize, SessionIconType } from './icon';
 
 interface Props {
   label: string;
@@ -21,6 +22,9 @@ export class SessionInput extends React.PureComponent<Props, State> {
     super(props);
 
     this.updateInputValue = this.updateInputValue.bind(this);
+    this.renderEnableShowHideButton = this.renderEnableShowHideButton.bind(
+      this
+    );
 
     this.state = {
       inputValue: '',
@@ -54,20 +58,35 @@ export class SessionInput extends React.PureComponent<Props, State> {
           onChange={e => {
             this.updateInputValue(e);
           }}
+          className={classNames(
+            enableShowHide ? 'session-input-floating-label-show-hide' : ''
+          )}
         />
-        <button
+
+        {this.renderEnableShowHideButton(enableShowHide)}
+
+        <hr />
+      </div>
+    );
+  }
+
+  private renderEnableShowHideButton(enableShowHide: boolean | undefined) {
+    if (enableShowHide) {
+      return (
+        <SessionIconButton
+          iconType={SessionIconType.Eye}
+          iconSize={SessionIconSize.Small}
+          iconPadded={false}
           onClick={() => {
             this.setState({
               forceShow: !this.state.forceShow,
             });
           }}
-          className={classNames(enableShowHide ? '' : 'hidden')}
-        >
-          SHOW
-        </button>
-        <hr />
-      </div>
-    );
+        />
+      );
+    }
+
+    return undefined;
   }
 
   private updateInputValue(e: any) {