diff --git a/lib/classes/sidebar/LinkElement.php b/lib/classes/sidebar/LinkElement.php
index a6bbe961b5f4fad524946a7e97ae68655fffa77d..fccb9fae1a0c771167202874330b483cb6772264 100644
--- a/lib/classes/sidebar/LinkElement.php
+++ b/lib/classes/sidebar/LinkElement.php
@@ -226,7 +226,7 @@ class LinkElement extends WidgetElement implements ArrayAccess
     protected function renderButton()
     {
         return sprintf(
-            '<button formaction="%s" class="as-link" %s>%s</button>',
+            '<button formaction="%s" %s>%s</button>',
             htmlReady($this->url),
             arrayToHtmlAttributes((array) $this->attributes),
             htmlReady($this->label)
diff --git a/lib/classes/sidebar/OptionsWidget.php b/lib/classes/sidebar/OptionsWidget.php
index f50625c312906ad1ceeae822ee2c637102f3a380..a3660b5cc8c53ffb7efbc6ed6820bbfda43630e1 100644
--- a/lib/classes/sidebar/OptionsWidget.php
+++ b/lib/classes/sidebar/OptionsWidget.php
@@ -34,7 +34,7 @@ class OptionsWidget extends ListWidget
         $toggle_url_off = isset($toggle_url_off) ? html_entity_decode($toggle_url_off) : null;
 
         $content = sprintf(
-            '<button formaction="%s" role="checkbox" aria-checked="%s" class="as-link options-checkbox options-%s" %s>%s</button>',
+            '<button formaction="%s" role="checkbox" aria-checked="%s" class="options-checkbox options-%s" %s>%s</button>',
             htmlReady($state && $toggle_url_off !== null ? $toggle_url_off : $toggle_url),
             $state ? 'true' : 'false',
             $state ? 'checked' : 'unchecked',
@@ -55,7 +55,7 @@ class OptionsWidget extends ListWidget
         $url = html_entity_decode($url);
 
         $content = sprintf(
-            '<button formaction="%s" role="radio" aria-checked="%s" class="as-link options-radio options-%s" %s>%s</button>',
+            '<button formaction="%s" role="radio" aria-checked="%s" class="options-radio options-%s" %s>%s</button>',
             htmlReady($url),
             $checked ? 'true' : 'false',
             $checked ? 'checked' : 'unchecked',
diff --git a/resources/assets/stylesheets/scss/sidebar.scss b/resources/assets/stylesheets/scss/sidebar.scss
index 493049c4e39d9e90c3de73d767a444cac4508fe1..b67a49e744d02559c3a4acbe3737fb694e6819b6 100644
--- a/resources/assets/stylesheets/scss/sidebar.scss
+++ b/resources/assets/stylesheets/scss/sidebar.scss
@@ -125,6 +125,7 @@ ul.widget-list {
     }
 
     button {
+        @extend .as-link;
         text-align: left;
         width: 100%;
     }