diff --git a/src/scss/cdb-components/forms/toggle.scss b/src/scss/cdb-components/forms/toggle.scss
index 3a08ccf..c41ac45 100644
--- a/src/scss/cdb-components/forms/toggle.scss
+++ b/src/scss/cdb-components/forms/toggle.scss
@@ -6,20 +6,24 @@
 
 
 ```
-<div class="CDB-Text CDB-Size-small is-semibold u-rSpace--xl">
-  <label class="u-iBlock">TOOLS</label>
-  <input class="CDB-Toggle u-iBlock" type="checkbox" name="analysis">
-  <span class="u-iBlock CDB-ToggleFace"></span>
-  <label class="u-iBlock">SQL</label>
+<div class="Toggle">
+  <div class="CDB-Text CDB-Size-small is-semibold u-rSpace--xl">
+    <label class="u-iBlock">TOOLS</label>
+    <input class="CDB-Toggle u-iBlock" type="checkbox" name="analysis">
+    <span class="u-iBlock CDB-ToggleFace"></span>
+    <label class="u-iBlock">SQL</label>
+  </div>
 </div>
 
 <br/>
 
-<div class="CDB-Text CDB-Size-small is-semibold is-disabled u-rSpace--xl">
-  <label class="u-iBlock">TOOLS</label>
-  <input class="CDB-Toggle u-iBlock" type="checkbox" name="analysis" disabled >
-  <span class="u-iBlock CDB-ToggleFace"></span>
-  <label class="u-iBlock">SQL</label>
+<div class="Toggle">
+  <div class="CDB-Text CDB-Size-small is-semibold is-disabled u-rSpace--xl">
+    <label class="u-iBlock">TOOLS</label>
+    <input class="CDB-Toggle u-iBlock" type="checkbox" name="analysis" disabled >
+    <span class="u-iBlock CDB-ToggleFace"></span>
+    <label class="u-iBlock">SQL</label>
+  </div>
 </div>
 ```
 */
@@ -66,3 +70,7 @@
     }
   }
 }
+
+.Toggle .is-disabled {
+  opacity: 0.24;
+}
diff --git a/src/scss/cdb-components/typography.scss b/src/scss/cdb-components/typography.scss
index 3d262fa..1487433 100644
--- a/src/scss/cdb-components/typography.scss
+++ b/src/scss/cdb-components/typography.scss
@@ -32,9 +32,6 @@
   &.is-light {
     font-weight: $sFontWeight-lighter;
   }
-  &.is-disabled {
-    opacity: 0.24;
-  }
 }
 
 .is-underlined {