diff --git a/WORKSPACE b/WORKSPACE
index 21bbc8b2c3..ae6ee9ee3b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1077,8 +1077,8 @@ bower_archive(
 bower_archive(
     name = "paper-button",
     package = "polymerelements/paper-button",
-    sha1 = "41a8fec68d93dad223ad2076d68515334b2c8d7b",
-    version = "1.0.11",
+    sha1 = "3b01774f58a8085d3c903fc5a32944b26ab7be72",
+    version = "2.0.0",
 )
 
 bower_archive(
diff --git a/lib/js/bower_archives.bzl b/lib/js/bower_archives.bzl
index b914b63432..c03579366f 100644
--- a/lib/js/bower_archives.bzl
+++ b/lib/js/bower_archives.bzl
@@ -54,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(
@@ -99,17 +99,12 @@ def load_bower_archives():
     sha1 = "588d289f779d02b21ce5b676e257bbd6155649e8")
   bower_archive(
     name = "paper-behaviors",
-    package = "polymerelements/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",
+    package = "PolymerElements/paper-ripple",
     version = "1.0.10",
     sha1 = "21199db50d02b842da54bd6f4f1d1b10b474e893")
   bower_archive(
diff --git a/lib/js/bower_components.bzl b/lib/js/bower_components.bzl
index 79f40bb26e..fb40855559 100644
--- a/lib/js/bower_components.bzl
+++ b/lib/js/bower_components.bzl
@@ -223,8 +223,7 @@ def define_bower_components():
     deps = [
       ":iron-flex-layout",
       ":paper-behaviors",
-      ":paper-material",
-      ":paper-ripple",
+      ":paper-styles",
       ":polymer",
     ],
     seed = True,
@@ -265,14 +264,6 @@ 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",
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 2d61d18e89..a065f7a399 100644
--- a/polygerrit-ui/app/elements/shared/gr-button/gr-button.html
+++ b/polygerrit-ui/app/elements/shared/gr-button/gr-button.html
@@ -40,10 +40,14 @@ limitations under the License.
         text-transform: none;
       }
       paper-button {
+        /* paper-button sets this to anti-aliased, which appears different than
+        roboto-medium elsewhere. */
+        -webkit-font-smoothing: initial;
         align-items: center;
         background-color: var(--background-color);
         color: var(--button-color);
         display: flex;
+        font-family: inherit;
         justify-content: center;
         margin: var(--margin, 0);
         min-width: var(--border, 0);