diff --git a/core/themes/seven/css/base/elements.css b/core/themes/seven/css/base/elements.css
index 6273177..d954427 100644
--- a/core/themes/seven/css/base/elements.css
+++ b/core/themes/seven/css/base/elements.css
@@ -1,6 +1,12 @@
 /**
  * Generic elements.
  */
+html {
+  box-sizing: border-box;
+}
+*, *:before, *:after {
+  box-sizing: inherit;
+}
 body {
   color: #333;
   background: #fff;
diff --git a/core/themes/seven/css/components/buttons.css b/core/themes/seven/css/components/buttons.css
index ffc7d43..0fc55dd 100644
--- a/core/themes/seven/css/components/buttons.css
+++ b/core/themes/seven/css/components/buttons.css
@@ -13,12 +13,8 @@
  * 2. Normalize 'line-height'; can’t be changed from 'normal' in Firefox 4+.
  * 3. Allows full range of styling in Webkit and Gecko.
  *
- * @todo Consider moving box-sizing into base.css under a universal selector.
- * See https://drupal.org/node/2124251
- *
  */
 .button {
-  box-sizing: border-box;
   display: inline-block;
   position: relative;  /* 1 */
   text-align: center;
diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index 5dacb03..8a0d97d 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -136,7 +136,6 @@ input.form-file,
 input.form-date,
 input.form-time,
 textarea.form-textarea {
-  box-sizing:         border-box;
   padding: .3em .4em .3em .5em;
   max-width: 100%;
   border: 1px solid #b8b8b8;
@@ -277,7 +276,6 @@ textarea.form-textarea {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    box-sizing: border-box;
   }
   .password-strength {
     width: 100%;
diff --git a/core/themes/seven/css/components/tabs.css b/core/themes/seven/css/components/tabs.css
index 6f437fb..a5a3568 100644
--- a/core/themes/seven/css/components/tabs.css
+++ b/core/themes/seven/css/components/tabs.css
@@ -36,7 +36,6 @@
   position: relative;
   display: block;
   overflow: hidden;
-  box-sizing: border-box;
   margin: -1px 0 0;
   padding: 9px 2em 7px 1em;
   width: 100%;  /* 1 */
diff --git a/core/themes/seven/css/theme/maintenance-page.css b/core/themes/seven/css/theme/maintenance-page.css
index edf9018..626c932 100644
--- a/core/themes/seven/css/theme/maintenance-page.css
+++ b/core/themes/seven/css/theme/maintenance-page.css
@@ -153,7 +153,6 @@
 
   /* Positioning sidebar & content */
   main {
-    box-sizing: border-box;
     clear: none;
     float: left; /* LTR */
     padding-left: 3.85em;