diff --git a/README.md b/README.md
index 0561f76e..a83de065 100644
--- a/README.md
+++ b/README.md
@@ -176,13 +176,16 @@ The following custom properties and mixins are available for styling:
 | `--paper-input-container-disabled` | Mixin applied to the container when it's disabled | `{}` |
 | `--paper-input-container-label` | Mixin applied to the label | `{}` |
 | `--paper-input-container-label-focus` | Mixin applied to the label when the input is focused | `{}` |
+| `--paper-input-container-label-invalid` | Mixin applied to the label when the input is invalid | `{}` |
 | `--paper-input-container-label-floating` | Mixin applied to the label when floating | `{}` |
 | `--paper-input-container-input` | Mixin applied to the input | `{}` |
 | `--paper-input-container-underline` | Mixin applied to the underline | `{}` |
 | `--paper-input-container-underline-focus` | Mixin applied to the underline when the input is focused | `{}` |
+| `--paper-input-container-underline-invalid` | Mixin applied to the underline when the input is invalid | `{}` |
 | `--paper-input-container-underline-disabled` | Mixin applied to the underline when the input is disabled | `{}` |
 | `--paper-input-prefix` | Mixin applied to the input prefix | `{}` |
 | `--paper-input-suffix` | Mixin applied to the input suffix | `{}` |
+|`--paper-input-container-add-on-invalid` | Mixin applied to the add-on when the input is invalid | `{}` |
 
 This element is `display:block` by default, but you can set the `inline` attribute to make it
 `display:inline-block`.
diff --git a/demo/index.html b/demo/index.html
index f84799de..b88f2eae 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -140,6 +140,27 @@ <h3>Inputs can have custom logic</h3>
         </paper-input-container>
       </template>
     </demo-snippet>
+    
+    <h3>Inputs can have custom error styling</h3>
+    <demo-snippet>
+      <template>
+        <style is="custom-style">
+          .styled-error-input {
+            --paper-input-container-label-invalid: {
+              color: var(--paper-indigo-500);
+            };
+            --paper-input-container-underline-invalid: {
+              background: var(--paper-orange-500);
+            };
+            --paper-input-container-add-on-invalid: {
+              color: var(--paper-blue-grey-600);
+            };
+          }
+        </style>
+        <paper-input class="styled-error-input" label="this input requires some text" required auto-validate error-message="needs some text!"></paper-input>
+        <paper-input class="styled-error-input" label="this input requires letters only" auto-validate pattern="[a-zA-Z]*" error-message="letters only!"></paper-input>
+      </template>
+    </demo-snippet>
   </div>
 
   <script>
diff --git a/paper-input-container.html b/paper-input-container.html
index 72c3410d..cfb834b1 100644
--- a/paper-input-container.html
+++ b/paper-input-container.html
@@ -88,13 +88,16 @@
 `--paper-input-container-disabled` | Mixin applied to the container when it's disabled | `{}`
 `--paper-input-container-label` | Mixin applied to the label | `{}`
 `--paper-input-container-label-focus` | Mixin applied to the label when the input is focused | `{}`
+`--paper-input-container-label-invalid` | Mixin applied to the label when the input is invalid | `{}`
 `--paper-input-container-label-floating` | Mixin applied to the label when floating | `{}`
 `--paper-input-container-input` | Mixin applied to the input | `{}`
 `--paper-input-container-underline` | Mixin applied to the underline | `{}`
 `--paper-input-container-underline-focus` | Mixin applied to the underline when the input is focused | `{}`
+`--paper-input-container-underline-invalid` | Mixin applied to the underline when the input is invalid | `{}`
 `--paper-input-container-underline-disabled` | Mixin applied to the underline when the input is disabled | `{}`
 `--paper-input-prefix` | Mixin applied to the input prefix | `{}`
 `--paper-input-suffix` | Mixin applied to the input suffix | `{}`
+`--paper-input-container-add-on-invalid` | Mixin applied to the add-on when the input is invalid | `{}`
 
 This element is `display:block` by default, but you can set the `inline` attribute to make it
 `display:inline-block`.
@@ -164,6 +167,7 @@
         transition: transform 0.25s;
 
         @apply(--paper-transition-easing);
+        @apply(--paper-input-container-underline-invalid);
       }
 
       .unfocused-line {
@@ -250,6 +254,8 @@
       .input-content.is-invalid ::content label,
       .input-content.is-invalid ::content .paper-input-label {
         color: var(--paper-input-container-invalid-color, --error-color);
+
+        @apply(--paper-input-container-label-invalid);
       }
 
       .input-content.label-is-hidden ::content label,
@@ -306,6 +312,8 @@
 
       .add-on-content.is-invalid ::content * {
         color: var(--paper-input-container-invalid-color, --error-color);
+
+        @apply(--paper-input-container-add-on-invalid);
       }
 
       .add-on-content.is-highlighted ::content * {