diff --git a/addons/rose/addon/components/rose/form/input/index.hbs b/addons/rose/addon/components/rose/form/input/index.hbs
index 7f5747ac2..889ca0639 100644
--- a/addons/rose/addon/components/rose/form/input/index.hbs
+++ b/addons/rose/addon/components/rose/form/input/index.hbs
@@ -34,7 +34,7 @@
       </Rose::Form::HelperText>
     {{/if}}
 
-    <div class="rose-input-wrapper {{if @icon 'icon'}}">
+    <div class="rose-input-wrapper">
       {{#if @icon}}
         <Rose::Icon
           @name={{@icon}}
diff --git a/addons/rose/addon/styles/rose/components/form/_input.scss b/addons/rose/addon/styles/rose/components/form/_input.scss
index cade58db3..214f57734 100644
--- a/addons/rose/addon/styles/rose/components/form/_input.scss
+++ b/addons/rose/addon/styles/rose/components/form/_input.scss
@@ -5,14 +5,14 @@
   margin-bottom: sizing.rems(m);
 }
 
-.rose-input-wrapper.icon {
+.rose-input-wrapper {
   position: relative;
   .rose-icon {
     position: absolute;
     left: 10px;
     top: 10px;
   }
-  .rose-form-input-field {
+  .rose-icon + .rose-form-input-field {
     padding-left: 30px;
   }
 }