diff --git a/layouts/_partials/comments.html b/layouts/_partials/comments.html
index 99a3bf0..3860132 100644
--- a/layouts/_partials/comments.html
+++ b/layouts/_partials/comments.html
@@ -12,45 +12,4 @@
Enable JavaScript to see the comment section.
-{{ $url := .Permalink }}
-{{ if .IsTranslated }}
- {{ with index .AllTranslations 0 }}
- {{ $url = .Permalink }}
- {{ end }}
-{{ end }}
-
-
-
-
diff --git a/layouts/_partials/head.html b/layouts/_partials/head.html
index 06b7049..838e9ab 100644
--- a/layouts/_partials/head.html
+++ b/layouts/_partials/head.html
@@ -23,6 +23,44 @@
{{ end }}
{{ end }}
+ {{ $isso_url := .Permalink }}
+ {{ if .IsTranslated }}
+ {{ with index .AllTranslations 0 }}
+ {{ $isso_url = .Permalink }}
+ {{ end }}
+ {{ end }}
+
{{ if eq .Layout "search" }}
{{ with resources.Get "css/search.css" | fingerprint "sha512" }}
diff --git a/layouts/_partials/page-metadata/item/comments-counter.html b/layouts/_partials/page-metadata/item/comments-counter.html
new file mode 100644
index 0000000..f6e4c57
--- /dev/null
+++ b/layouts/_partials/page-metadata/item/comments-counter.html
@@ -0,0 +1,8 @@
+
+ {{ partial "icon.html" "message" }}
+ {{/* TODO: figure out if there's a nicer way to generate this URL
+ * the current issue is that we can't use RelRef, since content view means that we don't
+ * have access to the original page context
+ */}}
+ comments
+
diff --git a/layouts/_partials/page-metadata/post-full.html b/layouts/_partials/page-metadata/post-full.html
index bd13f4d..d184c55 100644
--- a/layouts/_partials/page-metadata/post-full.html
+++ b/layouts/_partials/page-metadata/post-full.html
@@ -21,6 +21,7 @@
{{ partial "page-metadata/item/readingtime.html" . }}
{{ partial "page-metadata/item/edithistory.html" . }}
{{ partial "page-metadata/item/viewraw.html" . }}
+ {{ partial "page-metadata/item/comments-counter.html" . }}
{{ partial "page-metadata/item/categories.html" . }}
diff --git a/layouts/_partials/page-metadata/post-short.html b/layouts/_partials/page-metadata/post-short.html
index aa0574d..9b799af 100644
--- a/layouts/_partials/page-metadata/post-short.html
+++ b/layouts/_partials/page-metadata/post-short.html
@@ -9,6 +9,7 @@
{{ partial "page-metadata/item/authors.html" . }}
{{ partial "page-metadata/item/readingtime.html" . }}
+ {{ partial "page-metadata/item/comments-counter.html" . }}
{{ partial "page-metadata/item/series.html" . }}
{{ partial "page-metadata/item/categories.html" . }}