diff --git a/src/browser/modules/Stream/Auth/ChangePasswordForm.jsx b/src/browser/modules/Stream/Auth/ChangePasswordForm.jsx
index fe465e692d3..2a12be587a3 100644
--- a/src/browser/modules/Stream/Auth/ChangePasswordForm.jsx
+++ b/src/browser/modules/Stream/Auth/ChangePasswordForm.jsx
@@ -146,7 +146,7 @@ export default class ChangePasswordForm extends Component {
                       disabled: isLoading
                     })}
                   />
-                   OR 
+                   OR  
                   <FormButton tabIndex="-1" onClick={this.onSuggestPassword}>
                     Generate
                   </FormButton>
diff --git a/src/browser/modules/Stream/Auth/styled.jsx b/src/browser/modules/Stream/Auth/styled.jsx
index beda3034b09..c185a5b0aef 100644
--- a/src/browser/modules/Stream/Auth/styled.jsx
+++ b/src/browser/modules/Stream/Auth/styled.jsx
@@ -96,25 +96,24 @@ export const StyledSegmentedConnectionTextInput = styled(StyledInput)`
 export const StyledRevealablePasswordWrapper = styled.div`
   position: relative;
   display: inline-block;
-  width: 44%;
+  width: calc(44% + 30px);
   min-width: 200px;
 
   > input {
-    padding-right: 30px;
-    width: 100%;
+    width: calc(100% - 30px);
   }
 
   > .icon {
+    display: inline-block;
+    width: 25px;
+    color: ${props => props.theme.primaryText};
     position: absolute;
     user-select: none;
     right: 0;
-    top: 6px;
+    top: 5px;
     height: auto;
-    width: auto;
     padding: 3px;
     cursor: pointer;
-    color: #333333;
-    opacity: 0.5;
   }
 `