diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 9a427333..04c599e4 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -16,9 +16,9 @@
                     <span
                       class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                     >
-                      {{ partial "icon.html" . }}
+                      {{- partial "icon.html" . -}}
                     </span>
-                  {{ end }}{{ if .Params.showName | default true }}
+                  {{- end -}}{{- if .Params.showName | default true -}}
                     <span
                       class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                       >{{ .Name | markdownify | emojify }}</span
@@ -55,9 +55,9 @@
                   <span
                     class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                   >
-                    {{ partial "icon.html" . }}
+                    {{- partial "icon.html" . -}}
                   </span>
-                {{ end }}{{ if .Params.showName | default true }}
+                {{- end -}}{{- if .Params.showName | default true -}}
                   <span
                     class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                     >{{ .Name | markdownify | emojify }}</span
diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html
index ffab9732..86216d1a 100644
--- a/layouts/partials/header/basic.html
+++ b/layouts/partials/header/basic.html
@@ -22,9 +22,9 @@
                       <span
                         class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                       >
-                        {{ partial "icon.html" . }}
+                        {{- partial "icon.html" . -}}
                       </span>
-                    {{ end }}{{ if .Params.showName | default true }}
+                    {{- end -}}{{- if .Params.showName | default true -}}
                       <span
                         class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                         >{{ .Name | markdownify | emojify }}</span
@@ -44,9 +44,9 @@
                     title="{{ i18n "footer.dark_appearance" }}"
                   >
                     {{ with .Params.icon | default "moon" }}
-                      {{ partial "icon.html" . }}
-                    {{ end }}
-                    {{ if .Params.showName | default true }}
+                      {{- partial "icon.html" . -}}
+                    {{- end -}}
+                    {{- if .Params.showName | default true -}}
                       <span
                         class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                         >{{ .Name | markdownify | emojify }}</span
@@ -77,9 +77,9 @@
                     <span
                       class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                     >
-                      {{ partial "icon.html" . }}
+                      {{- partial "icon.html" . -}}
                     </span>
-                  {{ end }}{{ if .Params.showName | default true }}
+                  {{- end -}}{{- if .Params.showName | default true -}}
                     <span
                       class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                       >{{ .Name | markdownify | emojify }}</span
diff --git a/layouts/partials/header/hamburger.html b/layouts/partials/header/hamburger.html
index 39cee2cb..c8e25fdc 100644
--- a/layouts/partials/header/hamburger.html
+++ b/layouts/partials/header/hamburger.html
@@ -38,9 +38,9 @@
                           <span
                             class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
                           >
-                            {{ partial "icon.html" . }}
+                            {{- partial "icon.html" . -}}
                           </span>
-                        {{ end }}{{ if .Params.showName | default true }}
+                        {{- end -}}{{- if .Params.showName | default true -}}
                           <span
                             class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                             >{{ .Name | markdownify | emojify }}</span
@@ -60,9 +60,9 @@
                         title="{{ i18n "footer.dark_appearance" }}"
                       >
                         {{ with .Params.icon | default "moon" }}
-                          {{ partial "icon.html" . }}
-                        {{ end }}
-                        {{ if .Params.showName | default true }}
+                          {{- partial "icon.html" . -}}
+                        {{- end -}}
+                        {{- if .Params.showName | default true -}}
                           <span
                             class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                             >{{ .Name | markdownify | emojify }}</span
@@ -74,9 +74,9 @@
                         title="{{ i18n "footer.light_appearance" }}"
                       >
                         {{ with .Params.icon | default "sun" }}
-                          {{ partial "icon.html" . }}
-                        {{ end }}
-                        {{ if .Params.showName | default true }}
+                          {{- partial "icon.html" . -}}
+                        {{- end -}}
+                        {{- if .Params.showName | default true -}}
                           <span
                             class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                             >{{ .Name | markdownify | emojify }}</span
@@ -93,9 +93,9 @@
                         <span
                           class="transition-colors group-dark:hover:text-primary-400 group-hover:text-primary-600"
                         >
-                          {{ partial "icon.html" . }}
+                          {{- partial "icon.html" . -}}
                         </span>
-                      {{ end }}{{ if .Params.showName | default true }}
+                      {{- end -}}{{- if .Params.showName | default true -}}
                         <span
                           class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                           >{{ .Name | markdownify | emojify }}</span
diff --git a/layouts/partials/header/hybrid.html b/layouts/partials/header/hybrid.html
index 753b4d5a..4814edc1 100644
--- a/layouts/partials/header/hybrid.html
+++ b/layouts/partials/header/hybrid.html
@@ -38,9 +38,9 @@
                           <span
                             class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                           >
-                            {{ partial "icon.html" . }}
+                            {{- partial "icon.html" . -}}
                           </span>
-                        {{ end }}{{ if .Params.showName | default true }}
+                        {{- end -}}{{- if .Params.showName | default true -}}
                           <span
                             class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                             >{{ .Name | markdownify | emojify }}</span
@@ -60,9 +60,9 @@
                         title="{{ i18n "footer.dark_appearance" }}"
                       >
                         {{ with .Params.icon | default "moon" }}
-                          {{ partial "icon.html" . }}
-                        {{ end }}
-                        {{ if .Params.showName | default true }}
+                          {{- partial "icon.html" . -}}
+                        {{- end -}}
+                        {{- if .Params.showName | default true -}}
                           <span
                             class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                             >{{ .Name | markdownify | emojify }}</span
@@ -74,9 +74,9 @@
                         title="{{ i18n "footer.light_appearance" }}"
                       >
                         {{ with .Params.icon | default "sun" }}
-                          {{ partial "icon.html" . }}
-                        {{ end }}
-                        {{ if .Params.showName | default true }}
+                          {{- partial "icon.html" . -}}
+                        {{- end -}}
+                        {{- if .Params.showName | default true -}}
                           <span
                             class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                             >{{ .Name | markdownify | emojify }}</span
@@ -93,9 +93,9 @@
                         <span
                           class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                         >
-                          {{ partial "icon.html" . }}
+                          {{- partial "icon.html" . -}}
                         </span>
-                      {{ end }}{{ if .Params.showName | default true }}
+                      {{- end -}}{{- if .Params.showName | default true -}}
                         <span
                           class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                           >{{ .Name | markdownify | emojify }}</span
@@ -136,9 +136,9 @@
                       <span
                         class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                       >
-                        {{ partial "icon.html" . }}
+                        {{- partial "icon.html" . -}}
                       </span>
-                    {{ end }}{{ if .Params.showName | default true }}
+                    {{- end -}}{{- if .Params.showName | default true -}}
                       <span
                         class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                         >{{ .Name | markdownify | emojify }}</span
@@ -158,9 +158,9 @@
                     title="{{ i18n "footer.dark_appearance" }}"
                   >
                     {{ with .Params.icon | default "moon" }}
-                      {{ partial "icon.html" . }}
-                    {{ end }}
-                    {{ if .Params.showName | default true }}
+                      {{- partial "icon.html" . -}}
+                    {{- end -}}
+                    {{- if .Params.showName | default true -}}
                       <span
                         class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                         >{{ .Name | markdownify | emojify }}</span
@@ -172,9 +172,9 @@
                     title="{{ i18n "footer.light_appearance" }}"
                   >
                     {{ with .Params.icon | default "sun" }}
-                      {{ partial "icon.html" . }}
-                    {{ end }}
-                    {{ if .Params.showName | default true }}
+                      {{- partial "icon.html" . -}}
+                    {{- end -}}
+                    {{- if .Params.showName | default true -}}
                       <span
                         class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                         >{{ .Name | markdownify | emojify }}</span
@@ -191,9 +191,9 @@
                     <span
                       class="group-dark:hover:text-primary-400 transition-colors group-hover:text-primary-600"
                     >
-                      {{ partial "icon.html" . }}
+                      {{- partial "icon.html" . -}}
                     </span>
-                  {{ end }}{{ if .Params.showName | default true }}
+                  {{- end -}}{{- if .Params.showName | default true -}}
                     <span
                       class="decoration-primary-500 group-hover:underline group-hover:decoration-2 group-hover:underline-offset-2"
                       >{{ .Name | markdownify | emojify }}</span
diff --git a/layouts/partials/icon.html b/layouts/partials/icon.html
index 831697a1..3e9e38d5 100644
--- a/layouts/partials/icon.html
+++ b/layouts/partials/icon.html
@@ -1,6 +1,6 @@
-{{ $icon := resources.Get (print "icons/" . ".svg") }}
-{{ if $icon }}
-  <span class="relative inline-block align-text-bottom icon">
-    {{ $icon.Content | safeHTML }}
+{{- $icon := resources.Get (print "icons/" . ".svg") -}}
+{{- if $icon -}}
+  <span class="relative inline-block align-text-bottom px-1 icon">
+    {{- $icon.Content | safeHTML -}}
   </span>
-{{ end }}
+{{- end -}}