diff --git a/app/assets/stylesheets/shared/question-mark-icon.scss b/app/assets/stylesheets/shared/question-mark-icon.scss
index 8e4df604bb..0d01ef1e0b 100644
--- a/app/assets/stylesheets/shared/question-mark-icon.scss
+++ b/app/assets/stylesheets/shared/question-mark-icon.scss
@@ -36,6 +36,9 @@
       @include icon-font;
       content: "";
       color: $white;
+      vertical-align: super;
+      position: relative;
+      top: 2px;
     }
   }
 }
@@ -45,6 +48,7 @@
   width: 15px;
   min-width: 15px;
   height: 15px;
+  margin-left: 2px;
 }
 
 .joyride-tip-guide.question-mark-tooltip {
diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml
index ea4a9385b9..c5ec3e3cdf 100644
--- a/app/views/spree/admin/products/new.html.haml
+++ b/app/views/spree/admin/products/new.html.haml
@@ -55,13 +55,13 @@
         - if feature? :unit_price, spree_current_user
           .four.columns{ ng: { app: 'ofn.admin'}}
             = f.field_container :unit_price do
-              = f.label :unit_price, t(".unit_price")
-              %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
+              %div{style: "display: flex"}
+                = f.label :unit_price, t(".unit_price")
+                %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
                   "question-mark-with-tooltip-append-to-body" => "true",
                   "question-mark-with-tooltip-placement" => "top",
                   "question-mark-with-tooltip-animation" => true, 
                   key: "'js.admin.unit_price_tooltip'"}
-              %br/
               = f.text_field :price, {"class" => 'fullwidth', "disabled" =>  true, "ng-model" => "unit_price"}
               %div{style: "color: black"}
                 = t(".unit_price_legend")
diff --git a/app/views/spree/admin/variants/_form.html.haml b/app/views/spree/admin/variants/_form.html.haml
index 7a20298df4..54017cc9f4 100644
--- a/app/views/spree/admin/variants/_form.html.haml
+++ b/app/views/spree/admin/variants/_form.html.haml
@@ -39,13 +39,13 @@
         = hidden_field_tag 'product_variant_unit', @product.variant_unit
         = hidden_field_tag 'product_variant_unit_name', @product.variant_unit_name
         = f.field_container :unit_price do
-          = f.label :unit_price, t(".unit_price"), {style: "display: inline-block"}
-          %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
-            "question-mark-with-tooltip-append-to-body" => "true",
-            "question-mark-with-tooltip-placement" => "top",
-            "question-mark-with-tooltip-animation" => true, 
-            key: "'js.admin.unit_price_tooltip'"}
-          %br/
+          %div{style: "display: flex"}
+            = f.label :unit_price, t(".unit_price"), {style: "display: inline-block"}
+            %question-mark-with-tooltip{"question-mark-with-tooltip" => "_",
+              "question-mark-with-tooltip-append-to-body" => "true",
+              "question-mark-with-tooltip-placement" => "top",
+              "question-mark-with-tooltip-animation" => true, 
+              key: "'js.admin.unit_price_tooltip'"}
           = f.text_field :price, {"class" => 'fullwidth', "disabled" =>  true, "ng-model" => "unit_price"}
           %div{style: "color: black"}
             = t("spree.admin.products.new.unit_price_legend")