diff --git a/layouts/shortcodes/button.html b/layouts/shortcodes/button.html
index 58f1eb8..fb87840 100644
--- a/layouts/shortcodes/button.html
+++ b/layouts/shortcodes/button.html
@@ -1,26 +1,26 @@
-{{ $ref := "" }}
-{{ $target := "" }}
-{{ $size := default "regular" (.Get "size" | lower) }}
+{{- $ref := "" }}
+{{- $target := "" }}
+{{- $size := default "regular" (.Get "size" | lower) }}
 
-{{ if not (in (slice "regular" "large") $size) }}
-  {{ $size = "regular" }}
-{{ end }}
+{{- if not (in (slice "regular" "large") $size) }}
+  {{- $size = "regular" }}
+{{- end }}
 
-{{ with .Get "href" }}
-  {{ $ref = . }}
-  {{ $target = "_blank" }}
-{{ end }}
+{{- with .Get "href" }}
+  {{- $ref = . }}
+  {{- $target = "_blank" }}
+{{- end }}
 
-{{ with .Get "relref" }}
-  {{ $ref = relref $ . }}
-{{ end }}
+{{- with .Get "relref" }}
+  {{- $ref = relref $ . }}
+{{- end }}
 
 
 <span class="gdoc-button gdoc-button--{{ $size }}{{ with .Get "class" }}{{ . }}{{ end }}">
   <a
-    {{ with $ref }}href="{{ . }}"{{ end }}
-    {{ with $target }}target="{{ . }}"{{ end }}
     class="gdoc-button__link"
+    {{- with $ref }}{{ printf " href=\"%s\"" . | safeHTMLAttr }}{{ end }}
+    {{- with $target }}{{ printf " target=\"%s\"" . | safeHTMLAttr }}{{ end }}
   >
     {{ $.Inner }}
   </a>