diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..bf61aef403
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @ONSdigital/design-team-devs
diff --git a/src/components/button/_button.scss b/src/components/button/_button.scss
index 2f83158649..a64eb961c6 100644
--- a/src/components/button/_button.scss
+++ b/src/components/button/_button.scss
@@ -28,8 +28,9 @@ $button-shadow-size: 3px;
 
     &--search {
         .ons-icon {
-            @include mq(s, l) {
-                margin-right: 0.5rem;
+            margin: 0.125rem 0.5rem 0.125rem 0;
+            @include mq(xs, s) {
+                margin-right: 0;
             }
         }
     }
diff --git a/src/scss/base/_typography.scss b/src/scss/base/_typography.scss
index 5f88fe069f..720c8dc56f 100644
--- a/src/scss/base/_typography.scss
+++ b/src/scss/base/_typography.scss
@@ -1,7 +1,7 @@
 html {
     @include font-smoothing;
 
-    font-size: $base;
+    font-size: calc((100% / 16) * strip-unit($base));
 }
 
 body {
diff --git a/src/scss/helpers/_mq.scss b/src/scss/helpers/_mq.scss
index ee630c660f..fd9da52b45 100644
--- a/src/scss/helpers/_mq.scss
+++ b/src/scss/helpers/_mq.scss
@@ -57,7 +57,7 @@
 /// @return {Number} - Unitless number
 @function strip-unit($number) {
     @if meta.type-of($number) == 'number' and not math.is-unitless($number) {
-        @return $number / ($number * 0 + 1);
+        @return math.div($number, ($number * 0 + 1));
     }
 
     @return $number;