diff --git a/.eslintrc.json b/.eslintrc.json
index b2f1b7e..aa0ca88 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,19 +1,32 @@
 {
-  "extends": "eslint:recommended",
-  "rules": {
-    "no-console": 0
-  },
-  "env": {
-    "browser": true,
-    "es6": true
-  },
-  "plugins": [
-    "html"
-  ],
-  "globals": {
-    "CustomElements": false,
-    "HTMLImports": false,
-    "Polymer": false,
-    "WeakMap": false
-  }
+    "extends": "eslint:recommended",
+    "rules": {
+        "no-console": 0,
+        "no-extra-parens": 2,
+        "eqeqeq": 2,
+        "no-global-assign": 2,
+        "no-loop-func": 2,
+        "wrap-iife": 2,
+        "no-undef-init": 2,
+        "indent": ["error", 2, {
+            "SwitchCase": 1
+        }],
+        "space-before-blocks": 2,
+        "keyword-spacing": ["error", {
+            "before": true
+        }]
+    },
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "plugins": [
+        "html"
+    ],
+    "globals": {
+        "CustomElements": false,
+        "HTMLImports": false,
+        "Polymer": false,
+        "WeakMap": false
+    }
 }
diff --git a/.htmlhintrc b/.htmlhintrc
new file mode 100644
index 0000000..cce2cd4
--- /dev/null
+++ b/.htmlhintrc
@@ -0,0 +1,29 @@
+{
+  "tagname-lowercase": true,
+  "attr-lowercase": true,
+  "attr-value-double-quotes": true,
+  "doctype-first": true,
+  "tag-pair": true,
+  "spec-char-escape": true,
+  "id-unique": true,
+  "src-not-empty": true,
+  "attr-no-duplication": true,
+  "title-require": true,
+  "doctype-first": false,
+  "jshint": {
+    "node": true,
+    "esnext": true,
+    "bitwise": true,
+    "eqeqeq": true,
+    "immed": true,
+    "latedef": "nofunc",
+    "newcap": true,
+    "noarg": true,
+    "regexp": true,
+    "undef": true,
+    "smarttabs": true,
+    "asi": true,
+    "debug": true,
+    "predef": ["Parse", "Polymer", "suite", "setup", "fixture", "test", "assert", "expect", "flush", "sinon", "teardown", "window", "getComputedStyle", "forceXIfStamp", "MockInteractions", "document", "CustomEvent", "navigator", "moment", "XMLHttpRequest"]
+  }
+}
diff --git a/.travis.yml b/.travis.yml
index ba2fed4..d180734 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,5 @@ script:
   local; fi
 env:
   global:
-  - secure: Dfr1e9tJLnptn0sJDnwjUlUT1TTmRrh6/myOICP/2NV33DgRz7GEnxK0UY8MOvfXvdBfS+u8WWQiKCD0zh+ulJr10Y0mi3BLqRtw96+vT/Qo1f19FsxNRmuiX/G5uFz8XCjIjjCuqLTCNmQsZcmAj28f8YxDSJ9ztymlKdAQgM9jUzBwsXKlLHRHOn5jIbFZjdfPdcVnDPv/JpywZltL4p3Ej721ToD3nkr4yloHerVmKcBpx/3v5AWDeW4fjiPDz1mg2SRplQDFYt1EZo4FG0w1uQzkSqx71O4gOBFwYkfxzWAdaXxAInLZNJ1HyvXLEpYjR/8dqeL0lTbFR/AvRqqU0oGu16R+uzWziFJ+RKa9VISLHD4BtGFNPfSqJyv8QpRCebxh9BVQWlPgoSkA73AaNWN+s05eKCdV6dL4uUrs/KpSs3You2AVg2cxlY36AnL2+dHtg4DhFVnzvHKk2bgLQsqmyLI1FTuEX5GLeF0JJOEyLPWjFx/hLmhA3mR3LlUnZvAupSS78N3PGuh/z82xwvLEf+mrnFtPprG9CRg3bdu1VU1Qb9+kIB0zeL4TU+hEk2HyEc/sGrVf4UvB9iVTLw8pYz6sCGMjlPzIg9UVuMzPiAntieA81F/shdnvdk1O+NhsWZx+N83RLMIzlVlXBYy8INPb2dW+c0x5dP4=
-  - secure: A5GUVat99tWwZBZ3da5h49MNANiipvgBqU//aJyB/YhnDij/EivdHdSfX4aMMgVqEKQ36UJG+BGL7jKZl9HZvdZ43yxn1ukvnV4E5yBXNX7n6dSypCjP0VeQmqGcS1t70Lp2Svde82pgMWn+XTh440pjXC2F7O8ygrQdnhvEjF7UR8eJptAlEaJKHMxHF842ExRAJdgnjDynA0Q9Dk7Vl2CQAVTZsfanuwdelPpwVsWvFnoYJ0zz3VbJ5H5iubWiHZaq3IF+gCnTL9eCvTH2mle5TDP8n6KFLYEMzWu5oWeEmTO0tQS8o9hZY5/PzV7Gqt7BghAGsu/GCmv3AbAJ4IKNd1YVQZsG8d2tEnuz40CjTdFaTyxoE7cx0Bw2MG41u+dRafMAdwC+GbqwYb2x2VpFHvgCIyGSE8piZ0rVrQ9YTKIHpoNu450tYTqtjnVGRSHFJCBxwfQm6eNPhz9PIrBeQJBEBjpbQ+8h9ljNO6vSmnw8WEnJS1E5SKy92ScTpxAeAqg/XXguCtdyPJtt0Nws1TlUl3gU0brCmGiH02SgvhIXZHoDOsrQPwRzMc2hrTR3clIJF5TWnN7iu/6m9qSSkYyRmsczORyzv8sV2fOsp0QkUqDqmxGgj5HOQUtuz6WURsoL9uCJJgBySrncraF5z23SJulo+BM4SoGcKT8=
+  - secure: rMaZ4Q9D6NUE4KX5kEAA3E1TIMKkUXsUM4UQJllQdSKBcmC0VDZ6l6PDQupZkJAF2nRiEIaA8P8zfUrpmiduSKVfbPXtCzDMKJpZ6Pjrghh7EMXEEgMGaUNAOj1O85tiYew2CK/vsvkjFeNquIJeqFpG9oSVn004G8ZihxGysgk3I59WC8CmCGVw4HU1wCDgUC84o/eydq8uyNBPSMwlMqVjhwbxQrzzlQUIZPkTM9Ka7zC9Mx/TJWCOwBmAyFLtP+Bqs2h0B8xzuGDTgXDDfwzv49ohhxOgsAjw3RaVT1CGICGGsU5xK2Y7PYXOpDK9ZsleCD93wLF5BQUISWXnB2QSuCXnYqH2jME8b4jeaYXbmU6XcZoYOBQOUt6WM6qF1pNdbxe37573nXNO0xaSJGJ+beVOpCCKXZwFUxkx+bXmiF1lwu0+sdi++7Fnd8TVGoMPZU4KpUISjTACC+qXZHsxc0Sr4MEqH9f1wRNMyzbTgdcrSx3XX9PbnlbwNj00lNx+98hls/ONMcs676ejR6q3lPSpeCxEAtSN3CAIHrOqa3juFnMIP1A/mjQjygcfTJ48ZnuO3DhxIOMU3mju5FkTMICdqdrjPesSWrC15N6n+9Y0vZOSDk/YVVaKjARnUzjWUIV8gbUiLTeon+k74QUwqxW8LNAPqUD26b6YG8A=
+  - secure: v2x4eN1bzY6gm7rmz0ln+Wd7liad2YbEsvuErengsZrfNPGx2b3Zks9vBScPYJP/yAbYy9SFMvGyAF+m0sFqymeE/7MeHnBIWUzg0lZz4gHB1BF8tPV7gZRkyYemDaMMrUWDGqDXesqCY3T06ln8w5eYgz9afzLK7fAUXO1BaLPTb4p4H9gYZj0XN5ASNUZOVjDpJTlsIHtmmTjASKBsVc90FK0Ybn+GT3ZxSBnHEWkEYFRorlfOF3kbG54lGcyEIuJs6BxJ2BrcYRSy17X+D3qmim87pku4dSPP4okHdHKaH9eaLmLIAZDDaOOZHm5uBszk7PpLFztWcMBd+KJ7nqYKur4qxvtSnhnzgswr8YJHjAJTg1CJFYRu+Hwp0pom9AbtUH8cGa08WlBpQQBACq0mBLmKmBGbqmt7VrpBWBiqh/uHXDwpkzNhhCmH4LW7eOakgFS1zMYQ0AVZ+40wt3C2F7N9yDHc40GGlsfUIeMJcbq6sCtCXyRKi2zdcUDfRoY5CZyhVmeQTOejNEfreYunoUGS2Jn8NecK89Jf0FD/EnNu+owxHcdE+WjzeJSpC1QgJw5Nye/a/XwLpmdL3XrjlfQPo0SBDAjM0/o10Def7+nEkTLRk+P60YS6tgGitFzPNyMstPYavdCD6ISWHkfpo2Wm0llx/PkRY+W/lXo=
diff --git a/bower.json b/bower.json
index 2e10498..aa539dd 100644
--- a/bower.json
+++ b/bower.json
@@ -25,7 +25,6 @@
     "paper-input": "PolymerElements/paper-input#^1.0.0",
     "iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#~1.1.1",
     "iron-icon": "PolymerElements/iron-icon#^1.0.11",
-    "iron-icons": "PolymerElements/iron-icons#^1.1.3",
     "paper-material": "PolymerElements/paper-material#^1.0.0",
     "paper-icon-button": "PolymerElements/paper-icon-button#^1.0.0"
   },
diff --git a/hipaa-password-icons.html b/hipaa-password-icons.html
new file mode 100644
index 0000000..1ac6e6e
--- /dev/null
+++ b/hipaa-password-icons.html
@@ -0,0 +1,17 @@
+<link rel="import" href="../iron-icon/iron-icon.html">
+<link rel="import" href="../iron-iconset-svg/iron-iconset-svg.html">
+
+<iron-iconset-svg name="hipaa-password-icons" size="24">
+  <svg>
+    <defs>
+      <g id="shape">
+        <rect x="12" y="0" width="12" height="24" />
+        <circle cx="12" cy="12" r="12" />
+      </g>
+
+      <g id="visibility"><path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"/></g>
+      <g id="visibility-off"><path d="M12 7c2.76 0 5 2.24 5 5 0 .65-.13 1.26-.36 1.83l2.92 2.92c1.51-1.26 2.7-2.89 3.43-4.75-1.73-4.39-6-7.5-11-7.5-1.4 0-2.74.25-3.98.7l2.16 2.16C10.74 7.13 11.35 7 12 7zM2 4.27l2.28 2.28.46.46C3.08 8.3 1.78 10.02 1 12c1.73 4.39 6 7.5 11 7.5 1.55 0 3.03-.3 4.38-.84l.42.42L19.73 22 21 20.73 3.27 3 2 4.27zM7.53 9.8l1.55 1.55c-.05.21-.08.43-.08.65 0 1.66 1.34 3 3 3 .22 0 .44-.03.65-.08l1.55 1.55c-.67.33-1.41.53-2.2.53-2.76 0-5-2.24-5-5 0-.79.2-1.53.53-2.2zm4.31-.78l3.15 3.15.02-.16c0-1.66-1.34-3-3-3l-.17.01z"/></g>
+
+    </defs>
+  </svg>
+</iron-iconset-svg>
diff --git a/hipaa-password-input.html b/hipaa-password-input.html
index 8854184..625a7ce 100644
--- a/hipaa-password-input.html
+++ b/hipaa-password-input.html
@@ -1,10 +1,9 @@
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../paper-input/paper-input.html">
-<link rel="import" href="../paper-input/paper-input-behavior.html">
 <link rel="import" href="../paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../iron-icon/iron-icon.html">
-<link rel="import" href="../iron-icons/iron-icons.html">
 <link rel="import" href="../paper-input/paper-input-error.html">
+<link rel="import" href="hipaa-password-icons.html" async defer>
 <!--
 `hipaa-password-input`
 
@@ -106,7 +105,7 @@
 
       icon: {
         type: String,
-        value: 'visibility-off'
+        value: 'hipaa-password-icons:visibility-off'
       },
       autofocus: {
         type: Boolean
@@ -118,11 +117,11 @@
     },
 
     togglePasswordVisibility: function() {
-      if (this.icon === 'visibility-off') {
-        this.icon = 'visibility';
+      if (this.icon === 'hipaa-password-icons:visibility-off') {
+        this.icon = 'hipaa-password-icons:visibility';
         this.type = 'text';
       } else {
-        this.icon = 'visibility-off';
+        this.icon = 'hipaa-password-icons:visibility-off';
         this.type = 'password';
       }
     },