diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
index 956e8ad..097f5a9 100644
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -16,8 +16,8 @@
   {{ if .Get "link" }}</a>{{ end }}
   <figcaption>
 {{ else }}{{/* margin or normal */}}
-  <label for="{{ .Get "label" }}" class="margin-toggle">&#128172;</label>
-  <input type="checkbox" id="{{ .Get "label" }}" class="margin-toggle">
+  <label for="{{ .Get "label" }}" class="margin-toggle marginnote-ind">{{ .Site.Params.marginNoteInd }}</label>
+  <input type="checkbox" id="{{ .Get "label" }}" class="margin-toggle"/>
   <span class="marginnote">
   {{ if eq $type "margin" }}
     {{ with .Get "link" }}<a href="{{ . }}">{{ end }}
diff --git a/layouts/shortcodes/marginnote.html b/layouts/shortcodes/marginnote.html
index 7c11504..fb0e15f 100644
--- a/layouts/shortcodes/marginnote.html
+++ b/layouts/shortcodes/marginnote.html
@@ -1,4 +1,7 @@
-{{ $marginnoteDomIdSuffix := .Ordinal }}
-<label for="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle marginnote-ind">&#128172;</label>
-<input type="checkbox" id="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle"/>
-<span class="marginnote"><span class="marginnote-ind">&#128172;</span> {{ .Inner | markdownify}}</span>
+{{- $marginnoteDomIdSuffix := (add .Ordinal 1) -}}
+{{- $ind := .Get "ind" | default .Site.Params.marginNoteInd -}}
+<label for="marginnote-{{ $marginnoteDomIdSuffix }}" class="margin-toggle marginnote-ind">{{ $ind }}</label>
+<input type="checkbox" id="marginnote-{{ $marginnoteDomIdSuffix }}" class="margin-toggle"/>
+<span class="marginnote">
+{{ .Inner | markdownify}}
+</span>
diff --git a/layouts/shortcodes/sidenote.html b/layouts/shortcodes/sidenote.html
index d37f95c..d769229 100644
--- a/layouts/shortcodes/sidenote.html
+++ b/layouts/shortcodes/sidenote.html
@@ -3,9 +3,9 @@
 {{- else -}}
 {{- $.Page.Scratch.Set "sidenoteCounter" 1 -}}
 {{- end -}}
-{{ $sidenoteDomIdSuffix := $.Page.Scratch.Get "sidenoteCounter" }}
+{{- $sidenoteDomIdSuffix := $.Page.Scratch.Get "sidenoteCounter" -}}
 <label for="sidenote-{{ $sidenoteDomIdSuffix }}" class="margin-toggle sidenote-number">({{ $sidenoteDomIdSuffix }})</label>
 <input type="checkbox" id="sidenote-{{ $sidenoteDomIdSuffix }}" class="margin-toggle"/>
 <span class="sidenote">
-<span class="sidenote-number">({{ $sidenoteDomIdSuffix }})</span> {{ .Inner | markdownify }}
+<span class="sidenote-number">({{ $sidenoteDomIdSuffix }})</span>{{ .Inner | markdownify }}
 </span>