diff --git a/layouts/partials/topbar/button/next.html b/layouts/partials/topbar/button/next.html
index 34afca57c2..1be84e0036 100644
--- a/layouts/partials/topbar/button/next.html
+++ b/layouts/partials/topbar/button/next.html
@@ -2,8 +2,8 @@
 {{- $onwidthm := cond (isset . "onwidthm") .onwidthm "show" }}
 {{- $onwidthl := cond (isset . "onwidthl") .onwidthl "show" }}
 {{- with .page }}
-	{{- $showPrevNext := (and (not .Params.disableNextPrev) (not .Site.Params.disableNextPrev)) }}
-	{{- if $showPrevNext }}
+	{{- $show := not (.Param "disableNextPrev") }}
+	{{- if $show }}
 		{{- $endarrow := "🡒" }}
 		{{- if eq (.Language.LanguageDirection | default (T "Reading-direction") | default "ltr") "rtl" }}
 			{{- $endarrow = "🡐" }}
diff --git a/layouts/partials/topbar/button/prev.html b/layouts/partials/topbar/button/prev.html
index a91f095ce4..d06fd03ebe 100644
--- a/layouts/partials/topbar/button/prev.html
+++ b/layouts/partials/topbar/button/prev.html
@@ -2,8 +2,8 @@
 {{- $onwidthm := cond (isset . "onwidthm") .onwidthm "show" }}
 {{- $onwidthl := cond (isset . "onwidthl") .onwidthl "show" }}
 {{- with .page }}
-	{{- $showPrevNext := (and (not .Params.disableNextPrev) (not .Site.Params.disableNextPrev)) }}
-	{{- if $showPrevNext }}
+	{{- $show := not (.Param "disableNextPrev") }}
+	{{- if $show }}
 		{{- $startarrow := "🡐" }}
 		{{- if eq (.Language.LanguageDirection | default (T "Reading-direction") | default "ltr") "rtl" }}
 			{{- $startarrow = "🡒" }}
diff --git a/layouts/partials/topbar/button/toc.html b/layouts/partials/topbar/button/toc.html
index 65ea607d02..721efa7ba1 100644
--- a/layouts/partials/topbar/button/toc.html
+++ b/layouts/partials/topbar/button/toc.html
@@ -3,9 +3,8 @@
 {{- $onwidthm := cond (isset . "onwidthm") .onwidthm "show" }}
 {{- $onwidthl := cond (isset . "onwidthl") .onwidthl "show" }}
 {{- with .page }}
-	{{- $defaultDisableToc := .Site.Params.disableToc | default false }}
-	{{- $currentDisableToc := .Params.disableToc | default $defaultDisableToc }}
-	{{- if not $currentDisableToc }}
+	{{- $show := not (.Param "disableToc") }}
+	{{- if $show }}
 		{{- $content := partial "toc-class.html" . }}
 		{{- $hascontent := not (eq 0 (int (len (trim ($content | plainify) "\n\r\t ")))) }}
 		{{- if not $hascontent }}
diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt
index 76b2bba4fc..53b47a6da9 100644
--- a/layouts/partials/version.txt
+++ b/layouts/partials/version.txt
@@ -1 +1 @@
-7.2.1+d9152f9abaf57fec38d9a8ede67ebbf94303b9e3
\ No newline at end of file
+7.2.1+2cd8baa02f811124d580c519d95b3f977a1972f6
\ No newline at end of file