diff --git a/src/components/atoms/Form/Input.module.scss b/src/components/atoms/Form/Input.module.scss
index 55c86b9..f8d6883 100644
--- a/src/components/atoms/Form/Input.module.scss
+++ b/src/components/atoms/Form/Input.module.scss
@@ -17,16 +17,16 @@
     composes: inputWrap;
 
     .input {
-        padding-left: $spacer / 1.25;
+        padding-left: $spacer * 1.5;
     }
 
     svg {
         position: absolute;
-        left: $spacer / 3;
+        left: $spacer / 2;
         width: 1.25rem;
         height: 1.25rem;
         top: 50%;
-        margin-top: -.75rem;
+        margin-top: -.6rem;
         fill: rgba($brand-grey-light, .7);
     }
 }
diff --git a/src/components/atoms/Form/Input.tsx b/src/components/atoms/Form/Input.tsx
index 19904b7..936e06f 100644
--- a/src/components/atoms/Form/Input.tsx
+++ b/src/components/atoms/Form/Input.tsx
@@ -106,6 +106,7 @@ export default class Input extends PureComponent<InputProps, InputState> {
         return (
             <div className={this.inputWrapClasses()}>
                 <input className={styles.input} {...props} />
+                {props.type === 'search' && <SearchIcon />}
             </div>
         )
     }
@@ -139,7 +140,6 @@ export default class Input extends PureComponent<InputProps, InputState> {
                     onFocus={this.toggleFocus}
                     onBlur={this.toggleFocus}
                 />
-                {type === 'search' && <SearchIcon />}
 
                 {help && <Help>{help}</Help>}