diff --git a/layouts/partials/shortcodes/button.html b/layouts/partials/shortcodes/button.html
index b496548594..fe5f78414e 100644
--- a/layouts/partials/shortcodes/button.html
+++ b/layouts/partials/shortcodes/button.html
@@ -61,7 +61,7 @@
   {{- end }}
   {{- if and $icon (eq $iconposition "left") }}<i class="{{ $icon }}"></i>{{ end }}
   {{- if and $icon (eq $iconposition "left") $title }} {{ end }}
-  {{- $title | safeHTML }}
+  {{- if $title }}<span class="title">{{- $title | safeHTML }}</span>{{ end }}
   {{- if and $icon (eq $iconposition "right") $title }} {{ end }}
   {{- if and $icon (eq $iconposition "right") }}<i class="{{ $icon }}"></i>{{ end }}
   {{- if $isButton -}}
diff --git a/layouts/partials/topbar/func/button.html b/layouts/partials/topbar/func/button.html
index 65a48a52a2..9c3a5d60ac 100644
--- a/layouts/partials/topbar/func/button.html
+++ b/layouts/partials/topbar/func/button.html
@@ -38,7 +38,7 @@
 {{- end }}
 {{- if and $icon }}<i class="{{ $icon }}"></i>{{ end }}
 {{- if and $icon $title }} {{ end }}
-{{- $title | safeHTML }}
+{{- if $title }}<span class="title">{{- $title | safeHTML }}</span>{{ end }}
 {{- if $isDisabled -}}
               </span>
 {{- else if $isButton -}}
diff --git a/static/css/theme.css b/static/css/theme.css
index 6d955a8115..5e47fd126b 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -417,12 +417,29 @@ dd {
     }
 }
 
-.topbar-breadcrumbs a:hover,
-.topbar-breadcrumbs a:active,
-.topbar-breadcrumbs a:focus,
-.topbar-breadcrumbs a:hover *,
-.topbar-breadcrumbs a:active *,
-.topbar-breadcrumbs a:focus *,
+#R-topbar a:hover:empty,
+#R-topbar a:active:empty,
+#R-topbar a:focus:empty,
+#R-topbar a:hover :not(i),
+#R-topbar a:active :not(i),
+#R-topbar a:focus :not(i),
+#R-topbar button:hover :not(i),
+#R-topbar button:active :not(i),
+#R-topbar button:focus :not(i),
+#R-topbar .title:hover,
+#R-topbar .title:active,
+#R-topbar .title:focus,
+.topbar-content a:hover,
+.topbar-content a:active,
+.topbar-content a:focus,
+article a:hover,
+article a:active,
+article a:focus,
+article a:hover .copy-to-clipboard,
+article a:active .copy-to-clipboard,
+article a:focus .copy-to-clipboard {
+    text-decoration: underline;
+}
 .topbar-content a:hover,
 .topbar-content a:active,
 .topbar-content a:focus,
@@ -433,7 +450,6 @@ article a:hover .copy-to-clipboard,
 article a:active .copy-to-clipboard,
 article a:focus .copy-to-clipboard {
     outline: none;
-    text-decoration: underline;
 }
 article a:hover > img:only-child:empty,
 article a:active > img:only-child:empty,
@@ -1093,7 +1109,6 @@ html[dir="rtl"] .topbar-button-next i {
 
 .topbar-breadcrumbs {
     flex-grow: 1;
-    line-height: 1.2;
     margin: 0;
     padding: 0 1rem;
 }