diff --git a/docs/css/bulma-docs.css b/docs/css/bulma-docs.css
index 8f0cc471..740a826b 100644
--- a/docs/css/bulma-docs.css
+++ b/docs/css/bulma-docs.css
@@ -195,6 +195,7 @@ pre {
 }
 
 pre code {
+  -webkit-overflow-scrolling: touch;
   background: none;
   color: inherit;
   display: block;
@@ -1972,6 +1973,7 @@ input[type="submit"].button {
 .checkbox[disabled],
 .radio[disabled] {
   color: #7a7a7a;
+  cursor: not-allowed;
 }
 
 .radio + .radio {
@@ -4079,7 +4081,9 @@ a.nav-item.is-tab.is-active {
 .pagination-previous[disabled],
 .pagination-next[disabled],
 .pagination-link[disabled] {
-  background: #dbdbdb;
+  background-color: #dbdbdb;
+  border-color: #dbdbdb;
+  box-shadow: none;
   color: #7a7a7a;
   opacity: 0.5;
 }
diff --git a/docs/documentation/components/pagination.html b/docs/documentation/components/pagination.html
index b1d4d823..42fe497f 100644
--- a/docs/documentation/components/pagination.html
+++ b/docs/documentation/components/pagination.html
@@ -82,7 +82,7 @@ doc-subtab: pagination
 
 {% capture pagination_options_example %}
 <nav class="pagination">
-  <a class="pagination-previous is-disabled">Previous</a>
+  <a class="pagination-previous" title="This is the first page" disabled>Previous</a>
   <a class="pagination-next">Next page</a>
   <ul class="pagination-list">
     <li>
diff --git a/docs/documentation/elements/form.html b/docs/documentation/elements/form.html
index 9660575e..b22d3def 100644
--- a/docs/documentation/elements/form.html
+++ b/docs/documentation/elements/form.html
@@ -353,7 +353,7 @@ doc-subtab: form
 </div>
 <div class="field">
   <p class="control">
-    <label class="checkbox is-disabled">
+    <label class="checkbox" disabled>
       <input type="checkbox" disabled>
       Remember me
     </label>
@@ -361,11 +361,11 @@ doc-subtab: form
 </div>
 <div class="field">
   <p class="control">
-    <label class="radio is-disabled">
+    <label class="radio" disabled>
       <input type="radio" name="question" disabled>
       Yes
     </label>
-    <label class="radio is-disabled">
+    <label class="radio" disabled>
       <input type="radio" name="question" disabled>
       No
     </label>
diff --git a/docs/documentation/modifiers/helpers.html b/docs/documentation/modifiers/helpers.html
index 089ea936..4c1af599 100644
--- a/docs/documentation/modifiers/helpers.html
+++ b/docs/documentation/modifiers/helpers.html
@@ -50,11 +50,7 @@ doc-subtab: helpers
           <td>Text is right-aligned</td>
         </tr>
         <tr>
-          <th rowspan="4">Other</th>
-          <td><code>is-disabled</code></td>
-          <td>Removes any <strong>click</strong> event</td>
-        </tr>
-        <tr>
+          <th rowspan="3">Other</th>
           <td><code>is-marginless</code></td>
           <td>Removes any <strong>margin</strong></td>
         </tr>
diff --git a/docs/documentation/modifiers/syntax.html b/docs/documentation/modifiers/syntax.html
index 3563d0cf..74dc331d 100644
--- a/docs/documentation/modifiers/syntax.html
+++ b/docs/documentation/modifiers/syntax.html
@@ -152,7 +152,7 @@ doc-subtab: syntax
           <ul>
             <li><code>is-outlined</code></li>
             <li><code>is-loading</code></li>
-            <li><code>is-disabled</code></li>
+            <li><code>[disabled]</code></li>
           </ul>
         </div>
       </div>
@@ -164,7 +164,7 @@ doc-subtab: syntax
           <a class="button is-primary is-loading">Button</a>
         </p>
         <p class="field">
-          <a class="button is-primary is-disabled">Button</a>
+          <a class="button is-primary" disabled>Button</a>
         </p>
       </div>
       <div class="column is-half">
@@ -175,7 +175,7 @@ doc-subtab: syntax
 <a class="button is-primary is-loading">
   Button
 </a>
-<a class="button is-primary is-disabled">
+<a class="button is-primary" disabled>
   Button
 </a>
 {% endhighlight %}
diff --git a/docs/documentation/overview/modular.html b/docs/documentation/overview/modular.html
index 7669bf69..ddb65184 100644
--- a/docs/documentation/overview/modular.html
+++ b/docs/documentation/overview/modular.html
@@ -73,8 +73,8 @@ doc-subtab: modular
           <code>.is-link</code>
         </li>
         <li>
-          <code>.is-disabled</code>,
-          <code>.is-loading</code>
+          <code>.is-loading</code>,
+          <code>[disabled]</code>
         </li>
       </ul>
 {% highlight html %}
diff --git a/sass/base/generic.sass b/sass/base/generic.sass
index 2806d9f7..2972f02f 100644
--- a/sass/base/generic.sass
+++ b/sass/base/generic.sass
@@ -6,7 +6,7 @@ html
   min-width: 300px
   overflow-x: hidden
   overflow-y: scroll
-  text-rendering: $render-mode
+  text-rendering: $render-mode
 
 article,
 aside,
@@ -87,6 +87,7 @@ pre
   white-space: pre
   word-wrap: normal
   code
+    +overflow-touch
     background: none
     color: inherit
     display: block
diff --git a/sass/components/pagination.sass b/sass/components/pagination.sass
index c863a903..457d5bd7 100644
--- a/sass/components/pagination.sass
+++ b/sass/components/pagination.sass
@@ -65,7 +65,9 @@ $pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2)
   &:active
     box-shadow: $pagination-shadow-inset
   &[disabled]
-    background: $pagination-disabled-background
+    background-color: $pagination-disabled-background
+    border-color: $pagination-border
+    box-shadow: none
     color: $pagination-disabled
     opacity: 0.5
 
diff --git a/sass/elements/form.sass b/sass/elements/form.sass
index b8b74c1e..a98ec057 100644
--- a/sass/elements/form.sass
+++ b/sass/elements/form.sass
@@ -94,6 +94,7 @@ $input-radius:              $radius !default
     color: $input-hover
   &[disabled]
     color: $input-disabled
+    cursor: not-allowed
 
 .radio
   & + .radio