diff --git a/templates/server/plugins/section_links.phtml b/templates/server/plugins/section_links.phtml
deleted file mode 100644
index 4c3d376845..0000000000
--- a/templates/server/plugins/section_links.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="sectionlinks">
-<?php foreach ($plugins as $plugin_type => $plugin_list): ?>
-    <a href="#plugins-<?= preg_replace('/[^a-z]/', '', mb_strtolower($plugin_type)); ?>">
-         <?= htmlspecialchars($plugin_type); ?>
-    </a>
-<?php endforeach; ?>
-</div>
-<br />
\ No newline at end of file
diff --git a/templates/server/plugins/section_links.twig b/templates/server/plugins/section_links.twig
new file mode 100644
index 0000000000..f6862330f9
--- /dev/null
+++ b/templates/server/plugins/section_links.twig
@@ -0,0 +1,7 @@
+<div id="sectionlinks">
+{% for plugin_type in plugins|keys %}
+    <a href="#plugins-{{ preg_replace('/[^a-z]/', '', plugin_type|lower) }}">
+        {{ plugin_type }}
+    </a>
+{% endfor %}
+</div>
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 09da9a3543..d84e0ab195 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -1101,6 +1101,15 @@ div#logTable table {
 
 /* end serverstatus */
 
+#sectionlinks {
+    margin-bottom: 15px;
+    padding: 10px;
+    border: 1px solid #CCC;
+}
+#sectionlinks a {
+    margin-<?php echo $right; ?>: 7px;
+}
+
 /* server variables */
 #serverVariables {
     width: 100%;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index e626afca8e..6621188dcf 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1568,6 +1568,7 @@ div#profilingchart {
     font-size: 1.7em;
 }
 #sectionlinks {
+    margin-bottom: 15px;
     padding: 16px;
     background: #f3f3f3;
     border: 1px solid #aaa;