diff --git a/sass/directives/_toggles.scss b/sass/directives/_toggles.scss
index 0b59f3e6..685b9d02 100644
--- a/sass/directives/_toggles.scss
+++ b/sass/directives/_toggles.scss
@@ -88,27 +88,32 @@
     display: none;
   }
 
-  label {
+  span {
     @include display(flex);
-    @include align-items(center);
     @include flex(1);
-    margin: 0;
-    border: $form-border;
-    padding: 6px 24px;
-    background-color: $grey-lighter;
-    cursor: pointer;
-    transition: $toggle-button-transistion--radio;
-    font-size: $small-font-size;
 
-    &:first-of-type {
+    &:first-of-type label {
       border-top-left-radius: $minor-border-radius;
       border-bottom-left-radius: $minor-border-radius;
     }
 
-    &:last-of-type {
+    &:last-of-type label {
       border-top-right-radius: $minor-border-radius;
       border-bottom-right-radius: $minor-border-radius;
     }
+  }
+
+  label {
+    @include display(flex);
+    @include flex(1);
+    @include align-items(center);
+    margin: 0;
+    border: $form-border;
+    padding: 6px 24px;
+    background-color: $grey-lighter;
+    cursor: pointer;
+    transition: $toggle-button-transistion;
+    font-size: $small-font-size;
 
     &:before {
       content: '\f111';