diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee9a2502..e49e5bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 # Fix #568 max-width container
 # Fix #589 notification delete
 # Fix #272 nav-right without nav-menu
+# Fix #616 hero and notification buttons
 
 ## 0.4.0
 
diff --git a/docs/css/bulma-docs.css b/docs/css/bulma-docs.css
index ec435e03..e2dd0d25 100644
--- a/docs/css/bulma-docs.css
+++ b/docs/css/bulma-docs.css
@@ -2630,7 +2630,7 @@ input[type="submit"].button {
   margin-bottom: 1.5rem;
 }
 
-.notification a {
+.notification a:not(.button) {
   color: currentColor;
   text-decoration: underline;
 }
@@ -6068,7 +6068,7 @@ label.panel-block:hover {
   color: #0a0a0a;
 }
 
-.hero.is-white a,
+.hero.is-white a:not(.button),
 .hero.is-white strong {
   color: inherit;
 }
@@ -6081,7 +6081,7 @@ label.panel-block:hover {
   color: rgba(10, 10, 10, 0.9);
 }
 
-.hero.is-white .subtitle a,
+.hero.is-white .subtitle a:not(.button),
 .hero.is-white .subtitle strong {
   color: #0a0a0a;
 }
@@ -6159,7 +6159,7 @@ label.panel-block:hover {
   color: white;
 }
 
-.hero.is-black a,
+.hero.is-black a:not(.button),
 .hero.is-black strong {
   color: inherit;
 }
@@ -6172,7 +6172,7 @@ label.panel-block:hover {
   color: rgba(255, 255, 255, 0.9);
 }
 
-.hero.is-black .subtitle a,
+.hero.is-black .subtitle a:not(.button),
 .hero.is-black .subtitle strong {
   color: white;
 }
@@ -6250,7 +6250,7 @@ label.panel-block:hover {
   color: #363636;
 }
 
-.hero.is-light a,
+.hero.is-light a:not(.button),
 .hero.is-light strong {
   color: inherit;
 }
@@ -6263,7 +6263,7 @@ label.panel-block:hover {
   color: rgba(54, 54, 54, 0.9);
 }
 
-.hero.is-light .subtitle a,
+.hero.is-light .subtitle a:not(.button),
 .hero.is-light .subtitle strong {
   color: #363636;
 }
@@ -6341,7 +6341,7 @@ label.panel-block:hover {
   color: whitesmoke;
 }
 
-.hero.is-dark a,
+.hero.is-dark a:not(.button),
 .hero.is-dark strong {
   color: inherit;
 }
@@ -6354,7 +6354,7 @@ label.panel-block:hover {
   color: rgba(245, 245, 245, 0.9);
 }
 
-.hero.is-dark .subtitle a,
+.hero.is-dark .subtitle a:not(.button),
 .hero.is-dark .subtitle strong {
   color: whitesmoke;
 }
@@ -6432,7 +6432,7 @@ label.panel-block:hover {
   color: #fff;
 }
 
-.hero.is-primary a,
+.hero.is-primary a:not(.button),
 .hero.is-primary strong {
   color: inherit;
 }
@@ -6445,7 +6445,7 @@ label.panel-block:hover {
   color: rgba(255, 255, 255, 0.9);
 }
 
-.hero.is-primary .subtitle a,
+.hero.is-primary .subtitle a:not(.button),
 .hero.is-primary .subtitle strong {
   color: #fff;
 }
@@ -6523,7 +6523,7 @@ label.panel-block:hover {
   color: #fff;
 }
 
-.hero.is-info a,
+.hero.is-info a:not(.button),
 .hero.is-info strong {
   color: inherit;
 }
@@ -6536,7 +6536,7 @@ label.panel-block:hover {
   color: rgba(255, 255, 255, 0.9);
 }
 
-.hero.is-info .subtitle a,
+.hero.is-info .subtitle a:not(.button),
 .hero.is-info .subtitle strong {
   color: #fff;
 }
@@ -6614,7 +6614,7 @@ label.panel-block:hover {
   color: #fff;
 }
 
-.hero.is-success a,
+.hero.is-success a:not(.button),
 .hero.is-success strong {
   color: inherit;
 }
@@ -6627,7 +6627,7 @@ label.panel-block:hover {
   color: rgba(255, 255, 255, 0.9);
 }
 
-.hero.is-success .subtitle a,
+.hero.is-success .subtitle a:not(.button),
 .hero.is-success .subtitle strong {
   color: #fff;
 }
@@ -6705,7 +6705,7 @@ label.panel-block:hover {
   color: rgba(0, 0, 0, 0.7);
 }
 
-.hero.is-warning a,
+.hero.is-warning a:not(.button),
 .hero.is-warning strong {
   color: inherit;
 }
@@ -6718,7 +6718,7 @@ label.panel-block:hover {
   color: rgba(0, 0, 0, 0.9);
 }
 
-.hero.is-warning .subtitle a,
+.hero.is-warning .subtitle a:not(.button),
 .hero.is-warning .subtitle strong {
   color: rgba(0, 0, 0, 0.7);
 }
@@ -6796,7 +6796,7 @@ label.panel-block:hover {
   color: #fff;
 }
 
-.hero.is-danger a,
+.hero.is-danger a:not(.button),
 .hero.is-danger strong {
   color: inherit;
 }
@@ -6809,7 +6809,7 @@ label.panel-block:hover {
   color: rgba(255, 255, 255, 0.9);
 }
 
-.hero.is-danger .subtitle a,
+.hero.is-danger .subtitle a:not(.button),
 .hero.is-danger .subtitle strong {
   color: #fff;
 }
diff --git a/sass/elements/notification.sass b/sass/elements/notification.sass
index 76a2c1ad..01308f27 100644
--- a/sass/elements/notification.sass
+++ b/sass/elements/notification.sass
@@ -4,7 +4,7 @@
   border-radius: $radius
   padding: 1.25rem 2.5rem 1.25rem 1.5rem
   position: relative
-  a
+  a:not(.button)
     color: currentColor
     text-decoration: underline
   code,
diff --git a/sass/layout/hero.sass b/sass/layout/hero.sass
index 6f2acb74..7de0f7b4 100644
--- a/sass/layout/hero.sass
+++ b/sass/layout/hero.sass
@@ -68,14 +68,14 @@
     &.is-#{$name}
       background-color: $color
       color: $color-invert
-      a,
+      a:not(.button),
       strong
         color: inherit
       .title
         color: $color-invert
       .subtitle
         color: rgba($color-invert, 0.9)
-        a,
+        a:not(.button),
         strong
           color: $color-invert
       .nav