diff --git a/package-lock.json b/package-lock.json
index 655a0f1345..bd0d0b0abf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@edunext/frontend-component-header",
-  "version": "6.6.1-nelp.2",
+  "version": "6.6.1-nelp.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@edunext/frontend-component-header",
-      "version": "6.6.1-nelp.2",
+      "version": "6.6.1-nelp.3",
       "license": "AGPL-3.0",
       "dependencies": {
         "@edunext/frontend-essentials": "5.0.0",
diff --git a/package.json b/package.json
index 569fbfb65f..ffe6b59947 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@edunext/frontend-component-header",
-  "version": "6.6.1-nelp.2",
+  "version": "6.6.1-nelp.3",
   "description": "The standard header for Open edX",
   "main": "dist/index.js",
   "publishConfig": {
diff --git a/src/__snapshots__/Header.test.jsx.snap b/src/__snapshots__/Header.test.jsx.snap
index 781e7f729d..8fd890fc5c 100644
--- a/src/__snapshots__/Header.test.jsx.snap
+++ b/src/__snapshots__/Header.test.jsx.snap
@@ -40,7 +40,7 @@ exports[`<Header /> renders correctly for anonymous desktop 1`] = `
       </nav>
       <nav
         aria-label="Secondary"
-        className="nav secondary-menu-container align-items-center ml-auto"
+        className="nav secondary-menu-container align-items-center"
       >
         <a
           className="btn mr-2 btn-link"
@@ -237,7 +237,7 @@ exports[`<Header /> renders correctly for authenticated desktop 1`] = `
       </nav>
       <nav
         aria-label="Secondary"
-        className="nav secondary-menu-container align-items-center ml-auto"
+        className="nav secondary-menu-container align-items-center"
       >
         <div
           className="menu null"
diff --git a/src/desktop-header/DesktopHeader.jsx b/src/desktop-header/DesktopHeader.jsx
index 6ec6df3075..02b4490ae3 100644
--- a/src/desktop-header/DesktopHeader.jsx
+++ b/src/desktop-header/DesktopHeader.jsx
@@ -92,7 +92,7 @@ class DesktopHeader extends React.Component {
             </nav>
             <nav
               aria-label={intl.formatMessage(messages['header.label.secondary.nav'])}
-              className="nav secondary-menu-container align-items-center ml-auto"
+              className="nav secondary-menu-container align-items-center"
             >
               {getConfig().ENABLE_HEADER_LANG_SELECTOR && (<LanguageSelector />)}
               {loggedIn
diff --git a/src/index.scss b/src/index.scss
index 53edbe66a7..296cd3e018 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -45,9 +45,13 @@ $rounded-pill: 50rem  !default;
     }
   }
 
-  .user-dropdown .btn {
-    height: 3rem;
+  .user-dropdown{
+    margin-left: var(--pgn-spacing-spacer-base);
+    .btn {
+      height: 3rem;
+    }
   }
+
 }
 
 .site-header-mobile,
@@ -93,6 +97,8 @@ $rounded-pill: 50rem  !default;
     }
   }
   .secondary-menu-container {
+    margin-left: auto;
+
     .nav-link:hover,
     .nav-link:focus,
     .nav-link.active,
diff --git a/src/language-selector/LanguageSelector.scss b/src/language-selector/LanguageSelector.scss
index 7c2b439a5b..ddf8c487af 100644
--- a/src/language-selector/LanguageSelector.scss
+++ b/src/language-selector/LanguageSelector.scss
@@ -1,5 +1,5 @@
 .language-selector {
-  padding: .75rem;
+  padding: 0 var(--pgn-spacing-spacer-base);
 
   .dropdown-toggle {
     .lang-label-medium,
diff --git a/src/learning-header/AuthenticatedUserDropdown.jsx b/src/learning-header/AuthenticatedUserDropdown.jsx
index e27066223d..21106b8c09 100644
--- a/src/learning-header/AuthenticatedUserDropdown.jsx
+++ b/src/learning-header/AuthenticatedUserDropdown.jsx
@@ -36,7 +36,7 @@ const AuthenticatedUserDropdown = ({ intl, username }) => {
   ];
 
   return (
-    <Dropdown className="user-dropdown ml-3">
+    <Dropdown className="user-dropdown">
       <Dropdown.Toggle variant="outline-primary" aria-label={intl.formatMessage(messages.userOptionsDropdownLabel)}>
         <LearningUserMenuToggleSlot label={username} icon={faUserCircle} />
       </Dropdown.Toggle>