2 files changed, 13 insertions, 10 deletions

diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss
index 7364ab50b..45cef7b9a 100644
--- a/client/src/app/header/header.component.scss
+++ b/client/src/app/header/header.component.scss
@@ -2,22 +2,22 @@
 @import '_mixins';
 
 my-search-typeahead {
-  margin-right: 15px;
+  @include margin-right(15px);
 }
 
 .publish-button {
   @include peertube-button-link;
   @include orange-button;
   @include button-with-icon(22px, 3px, -1px);
-
-  margin-right: 25px;
+  @include margin-right(25px);
 
   @media screen and (max-width: 600px) {
-    margin-right: 10px;
+    @include margin-right(10px);
+
     padding: 0 10px;
 
     .icon.icon-upload {
-      margin-right: 0;
+      @include margin-right(0);
     }
 
     .publish-button-label {
diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss
index 3e0350ba0..ed7f3bd65 100644
--- a/client/src/app/header/search-typeahead.component.scss
+++ b/client/src/app/header/search-typeahead.component.scss
@@ -6,8 +6,9 @@
 #search-video {
   @include peertube-input-text($search-input-width);
 
-  padding-left: 10px;
-  padding-right: 40px; // For the search icon
+  @include padding-left(10px);
+  @include padding-right(40px); // For the search icon
+
   font-size: 14px;
 
   &::placeholder {
@@ -17,11 +18,12 @@
 
 .icon-search {
   @include icon(25px);
+  @include margin-left(-35px);
+
   height: 18px;
 
   // yolo
   position: absolute;
-  margin-left: -35px;
   margin-top: 3.5px;
   right: 10px;
 }
@@ -65,8 +67,9 @@ li.suggestion {
     margin-bottom: .5rem;
 
     em {
+      @include margin-right(0.2rem);
+
       font-weight: 600;
-      margin-right: 0.2rem;
       font-style: normal;
     }
   }
@@ -81,7 +84,7 @@ li.suggestion {
   }
 
   @media screen and (min-width: $mobile-view) {
-    margin-left: 10px;
+    @include margin-left(10px);
   }
 
   @media screen and (max-width: $small-view) {