diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html
index 0e7ddb1867..2fb9ba46e0 100644
--- a/layouts/shortcodes/expand.html
+++ b/layouts/shortcodes/expand.html
@@ -1,16 +1,14 @@
 {{ $_hugo_config := `{ "version": 1 }` }}
 <div class="expand">
-    <div class="expand-label" style="cursor: pointer;" onclick="$h = $(this);$h.next('div').slideToggle(100,function () {$h.children('i').attr('class',function () {return $h.next('div').is(':visible') ? 'fas fa-chevron-down' : 'fas fa-chevron-right';});});">
-        <i style="font-size:x-small;" class="fas fa-chevron-right"></i>
-        <span>
+    <a class="expand-label" onclick="$h = $(this);$h.next('div').slideToggle(100,function () {$h.children('i').attr('class',function () {return $h.next('div').is(':visible') ? 'fas fa-chevron-down' : 'fas fa-chevron-right';});});">
+        <i class="fas fa-chevron-right"></i>
         {{$expandMessage := T "Expand-title"}}
     	{{ if .IsNamedParams }}
     	{{.Get "default" | default $expandMessage}}
     	{{else}}
     	{{.Get 0 | default $expandMessage}}
     	{{end}}
-    	</span>
-    </div>
+    </a>
     <div class="expand-content" style="display: none;">
         {{.Inner | safeHTML}}
     </div>
diff --git a/static/css/theme.css b/static/css/theme.css
index 6b0d266e54..c759e2d76e 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -1133,3 +1133,12 @@ pre .copy-to-clipboard:hover {
 option {
     color: initial;
 }
+
+.expand-label {
+    cursor: pointer;
+}
+
+.expand-label i{
+    font-size: x-small;
+    width: 8px;
+}