diff --git a/WORKSPACE b/WORKSPACE
index 9bfd28fcda..ac4d04b582 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1082,6 +1082,13 @@ bower_archive(
     version = "2.0.0",
 )
 
+bower_archive(
+    name = "paper-button",
+    package = "polymerelements/paper-button",
+    sha1 = "41a8fec68d93dad223ad2076d68515334b2c8d7b",
+    version = "1.0.11",
+)
+
 bower_archive(
     name = "paper-input",
     package = "polymerelements/paper-input",
diff --git a/lib/js/bower_archives.bzl b/lib/js/bower_archives.bzl
index e8dcf12757..a7574f996d 100644
--- a/lib/js/bower_archives.bzl
+++ b/lib/js/bower_archives.bzl
@@ -39,9 +39,14 @@ def load_bower_archives():
     sha1 = "f58358ee652c67e6e721364ba50fb77a2ece1465")
   bower_archive(
     name = "iron-behaviors",
-    package = "PolymerElements/iron-behaviors",
+    package = "polymerelements/iron-behaviors",
     version = "1.0.18",
     sha1 = "e231a1a02b090f5183db917639fdb96cdd0dca18")
+  bower_archive(
+    name = "iron-checked-element-behavior",
+    package = "PolymerElements/iron-checked-element-behavior",
+    version = "1.0.6",
+    sha1 = "93ad3554cec119d8c5732d1c722ad113e1866370")
   bower_archive(
     name = "iron-fit-behavior",
     package = "PolymerElements/iron-fit-behavior",
@@ -49,7 +54,7 @@ def load_bower_archives():
     sha1 = "01c485fbf898307029bbb72ac7e132db1570a842")
   bower_archive(
     name = "iron-flex-layout",
-    package = "PolymerElements/iron-flex-layout",
+    package = "polymerelements/iron-flex-layout",
     version = "1.3.7",
     sha1 = "4d4cf3232cf750a17a7df0a37476117f831ac633")
   bower_archive(
@@ -92,6 +97,21 @@ def load_bower_archives():
     package = "polymerelements/neon-animation",
     version = "1.2.5",
     sha1 = "588d289f779d02b21ce5b676e257bbd6155649e8")
+  bower_archive(
+    name = "paper-behaviors",
+    package = "polymerelements/paper-behaviors",
+    version = "1.0.13",
+    sha1 = "a81eab28a952e124c208430e17508d9a1aae4ee7")
+  bower_archive(
+    name = "paper-material",
+    package = "polymerelements/paper-material",
+    version = "1.0.7",
+    sha1 = "159b7fb6b13b181c4276b25f9c6adbeaacb0d42b")
+  bower_archive(
+    name = "paper-ripple",
+    package = "polymerelements/paper-ripple",
+    version = "1.0.10",
+    sha1 = "21199db50d02b842da54bd6f4f1d1b10b474e893")
   bower_archive(
     name = "paper-styles",
     package = "PolymerElements/paper-styles",
diff --git a/lib/js/bower_components.bzl b/lib/js/bower_components.bzl
index 2f5abd49ba..172d22ffde 100644
--- a/lib/js/bower_components.bzl
+++ b/lib/js/bower_components.bzl
@@ -62,6 +62,15 @@ def define_bower_components():
       ":polymer",
     ],
   )
+  bower_component(
+    name = "iron-checked-element-behavior",
+    license = "//lib:LICENSE-polymer",
+    deps = [
+      ":iron-form-element-behavior",
+      ":iron-validatable-behavior",
+      ":polymer",
+    ],
+  )
   bower_component(
     name = "iron-dropdown",
     license = "//lib:LICENSE-polymer",
@@ -179,6 +188,28 @@ def define_bower_components():
     license = "//lib:LICENSE-page.js",
     seed = True,
   )
+  bower_component(
+    name = "paper-behaviors",
+    license = "//lib:LICENSE-polymer",
+    deps = [
+      ":iron-behaviors",
+      ":iron-checked-element-behavior",
+      ":paper-ripple",
+      ":polymer",
+    ],
+  )
+  bower_component(
+    name = "paper-button",
+    license = "//lib:LICENSE-polymer",
+    deps = [
+      ":iron-flex-layout",
+      ":paper-behaviors",
+      ":paper-material",
+      ":paper-ripple",
+      ":polymer",
+    ],
+    seed = True,
+  )
   bower_component(
     name = "paper-input",
     license = "//lib:LICENSE-polymer",
@@ -215,6 +246,22 @@ def define_bower_components():
     ],
     seed = True,
   )
+  bower_component(
+    name = "paper-material",
+    license = "//lib:LICENSE-polymer",
+    deps = [
+      ":paper-styles",
+      ":polymer",
+    ],
+  )
+  bower_component(
+    name = "paper-ripple",
+    license = "//lib:LICENSE-polymer",
+    deps = [
+      ":iron-a11y-keys-behavior",
+      ":polymer",
+    ],
+  )
   bower_component(
     name = "paper-styles",
     license = "//lib:LICENSE-polymer",
diff --git a/polygerrit-ui/BUILD b/polygerrit-ui/BUILD
index cb1966dd90..38be034474 100644
--- a/polygerrit-ui/BUILD
+++ b/polygerrit-ui/BUILD
@@ -20,6 +20,7 @@ bower_component_bundle(
         "//lib/js:iron-selector",
         "//lib/js:moment",
         "//lib/js:page",
+        "//lib/js:paper-button",
         "//lib/js:paper-input",
         "//lib/js:paper-item",
         "//lib/js:paper-listbox",
diff --git a/polygerrit-ui/app/elements/shared/gr-button/gr-button.html b/polygerrit-ui/app/elements/shared/gr-button/gr-button.html
index d16e57f040..c194bcbc78 100644
--- a/polygerrit-ui/app/elements/shared/gr-button/gr-button.html
+++ b/polygerrit-ui/app/elements/shared/gr-button/gr-button.html
@@ -15,6 +15,7 @@ limitations under the License.
 -->
 
 <link rel="import" href="../../../bower_components/polymer/polymer.html">
+
 <link rel="import" href="../../../behaviors/gr-tooltip-behavior/gr-tooltip-behavior.html">
 <link rel="import" href="../../../behaviors/keyboard-shortcut-behavior/keyboard-shortcut-behavior.html">
 <link rel="import" href="../../../styles/shared-styles.html">
diff --git a/tools/js/bower2bazel.py b/tools/js/bower2bazel.py
index 407b71a2f0..383e978664 100755
--- a/tools/js/bower2bazel.py
+++ b/tools/js/bower2bazel.py
@@ -54,6 +54,7 @@ package_licenses = {
   "moment": "moment",
   "neon-animation": "polymer",
   "page": "page.js",
+  "paper-button": "polymer",
   "paper-input": "polymer",
   "paper-item": "polymer",
   "paper-listbox": "polymer",