diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 1c5de5b9a..b9539fc71 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -636,7 +636,10 @@ body > header,
 .top-links {
   background: $dark;
   font-size: $small-font-size;
-  padding-right: $line-height / 2;
+
+  > :first-child {
+    @include grid-column-gutter;
+  }
 
   a {
     color: inherit;
diff --git a/app/assets/stylesheets/layout/locale_switcher.scss b/app/assets/stylesheets/layout/locale_switcher.scss
index dbc5918cd..424e7c793 100644
--- a/app/assets/stylesheets/layout/locale_switcher.scss
+++ b/app/assets/stylesheets/layout/locale_switcher.scss
@@ -2,7 +2,6 @@
   @include has-fa-icon(angle-down, solid, after);
   float: left;
   margin-bottom: $line-height / 4;
-  margin-left: $line-height / 2;
   margin-top: $line-height / 4;
   position: relative;