diff --git a/themes/finc/scss/_common.scss b/themes/finc/scss/_common.scss
index d5e61ac17e6b90ee00786712e120635d5f22be6e..5115ded897e30ec0b91a4198d6eae39b29ba976a 100644
--- a/themes/finc/scss/_common.scss
+++ b/themes/finc/scss/_common.scss
@@ -9,14 +9,23 @@
 // ************ Link text decoration *******************************
 // *****************************************************************
 
-.main,
 .mainbody {
-  a {
-    text-decoration: $mainbody-link-text-decoration;
+  // Fixme: Consider better way to differentiate between underlined and non-underlined elements - Ck
+  .record-list,
+  .media-body {
+    a:not(.btn) {
+      text-decoration: $mainbody-link-text-decoration;
+    }
+
+    // 'Merken' etc. in result list
+    .result-links a:not(.btn) {
+      text-decoration: $result-links-text-decoration;
+    }
   }
 }
 
 
+
 // *****************************************************************
 // ************ Hide empty containers ******************************
 // *****************************************************************
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index 0659a764e9b678aa855b669c5cc43f6aca57ed51..b95a5b8570115c289c320db84869a03625327bd8 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -191,7 +191,7 @@ $mainbody-link-text-decoration: $link-text-decoration !default;
 
 $btn-default-color: $oil !default;
 
-$btn-text-decoration: $link-text-decoration !default;
+$btn-text-decoration: none !default;
 
 // Use darker text color when default-buttons are used on white BG (new class: bth-transparent
 // for updateCart in search results, date-range slider in sidebar and adv search
@@ -990,6 +990,7 @@ $result-list-result-title-font-weight: normal !default;
 
 // Record entry-related links in result list, incl. QR codes, public favorites lists etc.
 $result-links-fa-icons-text-align: left !default;
+$result-links-text-decoration: none !default;
 
 // Favorites list in MyAccount
 
@@ -1094,7 +1095,7 @@ $pager-hover-color: $black !default;
 $pager-border: $border-default-styles !default;
 $pager-border-radius: 0 !default;
 
-
+$pager-text-decoration: none !default;
 
 
 
@@ -1112,7 +1113,7 @@ $book-bag-add-to-in-sidebar-toggler-color: $brand-primary !default;
 $record-view-toolbar-button-padding-add-to-bookbag: 1.2rem !default;
 $book-bag-add-to-in-sidebar-toggler-padding: $record-view-toolbar-button-padding  $record-view-toolbar-button-padding-add-to-bookbag !default;
 $book-bag-add-to-in-sidebar-toggler-text-align-xs: left !default;
-$book-bag-add-to-in-sidebar-toggler-text-decoration: $link-text-decoration !default;
+$book-bag-add-to-in-sidebar-toggler-text-decoration: none !default;
 $book-bag-add-to-in-sidebar-toggler-width: 100% !default;
 
 $book-bag-add-to-icon-content: '\f067' !default;
@@ -1218,6 +1219,7 @@ $icon-with-text-warning-color: $brand-warning !default;
 // *****************************************************************
 $record-tabs-padding-left: 1em !default;
 $record-tabs-padding-left-xs: 0 !default;
+$record-tabs-nav-text-decoration: none !default;
 
 $record-tabs-tab-content-padding: ($grid-gutter-width / 2) !default;
 $record-tabs-tab-content-a-word-break: break-word !default;
diff --git a/themes/finc/scss/components/_header-active-filters.scss b/themes/finc/scss/components/_header-active-filters.scss
index e3c67f2e23ba82b0260332f98a2757e352ca886d..e4e913a8e0417814085902ea3343eacde57b2eb6 100644
--- a/themes/finc/scss/components/_header-active-filters.scss
+++ b/themes/finc/scss/components/_header-active-filters.scss
@@ -82,6 +82,7 @@
   // show-all-filters-toggler
   .filters-toggle {
     float: $search-filter-all-filters-toggle;
+    text-decoration: $search-filter-text-decoration;
   }
 }
 
diff --git a/themes/finc/scss/components/_hierarchy-tree.scss b/themes/finc/scss/components/_hierarchy-tree.scss
index 45b072e82bde48d1e47c9cd5c7d938812cebcbfa..440e8691ccc7e2f27a5aec1bb564ee33c8968d87 100644
--- a/themes/finc/scss/components/_hierarchy-tree.scss
+++ b/themes/finc/scss/components/_hierarchy-tree.scss
@@ -127,9 +127,9 @@
   }
 }
 
-/* ***************************************************************************************** */
-/* TODO move following styles to seprate component (_collection-view.scss) in finc or de_105 */
-/* TODO upcoming refs #22979 */
+// ***************************************************************************************** */
+// TODO move following styles to seprate component (_collection-view.scss) in finc or de_105 */
+// TODO upcoming refs #22979 */
 
 .collection-control {
   display: inline-block;
diff --git a/themes/finc/scss/components/_pagination.scss b/themes/finc/scss/components/_pagination.scss
index 0458be07084fffb9f921815833d4a28279f7e5a5..5c3e66fc0a4b18c737ac0592b2f9d9e737f9016e 100644
--- a/themes/finc/scss/components/_pagination.scss
+++ b/themes/finc/scss/components/_pagination.scss
@@ -39,6 +39,10 @@
     margin-top: $pager-margin-top-xs;
   }
 
+  a {
+    text-decoration: $pager-text-decoration;
+  }
+
   .disabled {
     display: none;
   }
diff --git a/themes/finc/scss/components/_record-tabs.scss b/themes/finc/scss/components/_record-tabs.scss
index 2daa26546bab6b48d84714b1f487c007227861ef..a38fe8d7a697c6110c17a92a336193ec7b6bd748 100644
--- a/themes/finc/scss/components/_record-tabs.scss
+++ b/themes/finc/scss/components/_record-tabs.scss
@@ -11,6 +11,10 @@
   @media (max-width: $screen-xs-max) {
     padding-left: $record-tabs-padding-left-xs;
   }
+
+  .nav-tabs a {
+    text-decoration: $record-tabs-nav-text-decoration;
+  }
 }
 
 // Add left and right borders
diff --git a/themes/finc/scss/components/_sidebar.scss b/themes/finc/scss/components/_sidebar.scss
index 9be76eeff5dab7e86aa7a6237d1b106305b76c8e..c0f84e83742b709cb91a0ced8a2970a3e6d464d5 100644
--- a/themes/finc/scss/components/_sidebar.scss
+++ b/themes/finc/scss/components/_sidebar.scss
@@ -4,15 +4,8 @@
 // ************ General ********************************************
 // *****************************************************************
 
-// Sidebar width, when off-canvas is _off_;
-// For more on off-canvas see offcanvas.scss
-.sidebar {
-  body:not(.offcanvas) & {
-    @media (max-width: $screen-xs-max) {
-      width: 100%;
-    }
-  }
 
+.sidebar {
   // #13625 avoid ugly linebreaks with overlong words, RL
   -moz-hyphens: auto;
   -ms-hyphens: auto;
@@ -27,6 +20,20 @@
     padding-top: $mainbody-sidebar-top-padding-xs;
   }
 
+
+  a {
+    text-decoration: $sidebar-facet-link-text-decoration;
+  }
+
+
+  // Sidebar width, when off-canvas is _off_;
+  // For more on off-canvas see offcanvas.scss
+  body:not(.offcanvas) & {
+    @media (max-width: $screen-xs-max) {
+      width: 100%;
+    }
+  }
+
   // pull content to right border for sidebar right
   &.right {
     @include pull-sidebar-to-right($margin-right-width);