diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss
index 65a4a85b49..a01e48c700 100644
--- a/scss/mixins/_forms.scss
+++ b/scss/mixins/_forms.scss
@@ -30,7 +30,7 @@
           padding-right: $input-height-inner;
           background-image: escape-svg($icon);
           background-repeat: no-repeat;
-          background-position: right $input-height-inner-quarter top subtract($input-height-inner-quarter, 2px);
+          background-position: right subtract($input-height-inner-quarter, $input-border-width) top subtract($input-height-inner-quarter, $input-border-width);
           background-size: $input-height-inner-half $input-height-inner-half;
         }
       }
@@ -49,7 +49,7 @@
 
       .form-control-color {
         @include form-validation-state-selector($state) {
-          width: add($form-color-width, $input-height-inner);
+          width: calc(#{$form-color-width} + #{$input-height-inner-half} + #{$input-height-inner-quarter} - #{$input-border-width}); // stylelint-disable-line function-disallowed-list
         }
       }
     }