diff --git a/internal/template/functions.go b/internal/template/functions.go
index 59184ded..0fdf0303 100644
--- a/internal/template/functions.go
+++ b/internal/template/functions.go
@@ -88,7 +88,7 @@ func (f *funcMap) Map() template.FuncMap {
 		"theme_color": model.ThemeColor,
 		"icon": func(iconName string) template.HTML {
 			return template.HTML(fmt.Sprintf(
-				`<svg class="icon" aria-hidden="true"><use href="%s#icon-%s"/></svg>`,
+				`<svg aria-hidden="true"><use href="%s#icon-%s"/></svg>`,
 				route.Path(f.router, "appIcon", "filename", "sprite.svg"),
 				iconName,
 			))
diff --git a/internal/ui/static/css/common.css b/internal/ui/static/css/common.css
index 9a318993..26c21d89 100644
--- a/internal/ui/static/css/common.css
+++ b/internal/ui/static/css/common.css
@@ -175,8 +175,8 @@ a:hover {
     white-space: nowrap;
 }
 
-#header-menu .icon,
-.page-header ul a .icon {
+#header-menu a>svg,
+.page-header ul a>svg {
     margin-bottom: 2px;
 }
 
@@ -929,14 +929,16 @@ article.category-has-unread {
 }
 
 /* Icons */
-.icon,
+a>svg,
+button>svg,
 .icon-label {
     vertical-align: text-bottom;
     display: inline-block;
     margin-right: 2px;
 }
 
-.icon {
+a>svg,
+button>svg {
     width: 16px;
     height: 16px;
 }