diff --git a/src/components/Checkbox.js b/src/components/Checkbox.js
index c2b0d888..479ab512 100644
--- a/src/components/Checkbox.js
+++ b/src/components/Checkbox.js
@@ -8,8 +8,10 @@ const Label = styled.label`
   cursor: pointer;
   font-size: ${typography.size.s2}px;
   font-weight: ${typography.weight.bold};
-  min-height: 1em;
   position: relative;
+  height: 1em;
+  display: flex;
+  align-items: center;
 `;
 
 const OptionalText = styled.span`
@@ -34,35 +36,27 @@ const Error = styled.span`
   font-size: ${typography.size.s2}px;
   color: ${color.negative};
   margin-left: 6px;
-  vertical-align: text-top;
-  min-height: 1em;
-
-  ${props =>
-    !props.error &&
-    css`
-      margin: 0;
-    `}
+  height: 1em;
+  display: flex;
+  align-items: center;
 `;
 
 const LabelText = styled.span``;
 
 const Input = styled.input.attrs({ type: 'checkbox' })`
-  margin: 0 0.6em 0 0;
+  margin: 0 0.4em 0 0;
+  font-size: initial;
   opacity: 0;
   vertical-align: text-top;
 
   & + ${LabelText} {
-    display: inline-block;
-    vertical-align: text-top;
-    line-height: 1.2;
-
     &:before,
     &:after {
       position: absolute;
       top: 0;
       left: 0;
-      height: 14px;
-      width: 14px;
+      height: 1em;
+      width: 1em;
       content: '';
       display: block;
     }
@@ -111,10 +105,16 @@ const Input = styled.input.attrs({ type: 'checkbox' })`
   }
 `;
 
+const CheckboxWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+`;
+
 export function Checkbox({ id, label, error, hideLabel, ...props }) {
   const errorId = `${id}-error`;
   return (
-    <React.Fragment>
+    <CheckboxWrapper>
       <Label>
         <Input
           {...props}
@@ -130,7 +130,7 @@ export function Checkbox({ id, label, error, hideLabel, ...props }) {
       <Error id={errorId} error={error}>
         {error}
       </Error>
-    </React.Fragment>
+    </CheckboxWrapper>
   );
 }
 
diff --git a/src/components/Checkbox.stories.js b/src/components/Checkbox.stories.js
index b78abd86..82d8373b 100644
--- a/src/components/Checkbox.stories.js
+++ b/src/components/Checkbox.stories.js
@@ -9,23 +9,15 @@ storiesOf('Design System|forms/Checkbox', module)
   .addParameters({ component: Checkbox })
   .add('all checkboxes', () => (
     <form>
-      <div>
-        <Checkbox id="Unchecked" label="Cats" hideLabel onChange={onChange} />
-      </div>
-      <div>
-        <Checkbox id="Checked" label="Cats" hideLabel checked onChange={onChange} />
-      </div>
-      <div>
-        <Checkbox
-          id="With-label-and-error"
-          label="Cats"
-          onChange={onChange}
-          error="There's a snake in my boots"
-        />
-      </div>
-      <div>
-        <Checkbox id="With-label" label="Cats" onChange={onChange} />
-      </div>
+      <Checkbox id="Unchecked" label="Cats" hideLabel onChange={onChange} />
+      <Checkbox id="Checked" label="Cats" hideLabel checked onChange={onChange} />
+      <Checkbox
+        id="With-label-and-error"
+        label="Cats"
+        onChange={onChange}
+        error="There's a snake in my boots"
+      />
+      <Checkbox id="With-label" label="Cats" onChange={onChange} />
     </form>
   ))
   .add('unchecked', () => <Checkbox id="Unchecked" label="Cats" hideLabel onChange={onChange} />)