diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index 07c48677a274933ee910950b39ecba33bea80d03..286b90ac5b956e196aa468e44dca0debb55ab2fb 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -845,9 +845,9 @@ $search-filter-remove-button-text-white-space: nowrap !default;
 $search-filter-remove-icon: '\f00d' !default;
 $search-filter-remove-icon-hover-color: $red !default;
 $search-filter-remove-icon-vertical-align: top !default;
-$search-filter-remove-icon-in-dropdown-position: absolute !default;
 $search-filter-remove-icon-in-dropdown-distance-from-right: 1rem !default;
-
+$search-filter-remove-icon-in-dropdown-padding: 0 !default;
+$search-filter-remove-icon-in-dropdown-position: absolute !default;
 
 // Unset the vertical alignment from BS to align dropdowns AND indiv. buttons
 // The relevant definition is '.searchForm .btn {vertical-align: top;}'
diff --git a/themes/finc/scss/components/_header-active-filters.scss b/themes/finc/scss/components/_header-active-filters.scss
index 11c7638ce982b7dda425c37c98c4063cf5e0627c..b068618abf96f59ca037f35feeb188211ce19a73 100644
--- a/themes/finc/scss/components/_header-active-filters.scss
+++ b/themes/finc/scss/components/_header-active-filters.scss
@@ -125,6 +125,7 @@
 
     // Move 'x' to the right of the buttons in dropdown
     .search-filter-dropdown & {
+      padding: $search-filter-remove-icon-in-dropdown-padding;
       position: $search-filter-remove-icon-in-dropdown-position;
       right: $search-filter-remove-icon-in-dropdown-distance-from-right;
     }
diff --git a/themes/finc/templates/search/filters.phtml b/themes/finc/templates/search/filters.phtml
index 6d365819d79cb616c77265579ce677bee9ea1ad4..0a5a63cce457d10deaeb7f58b56b6300608ebaeb 100644
--- a/themes/finc/templates/search/filters.phtml
+++ b/themes/finc/templates/search/filters.phtml
@@ -130,7 +130,7 @@
   ?>
   <?php // Normal view ?>
   <div class="active-filters hidden-xs">
-    <?php if ($resetLink && $options->getRetainFilterSetting()): ?>
+    <?php if ($resetLink && !empty($value) && $options->getRetainFilterSetting()): ?>
       <?php /* finc adds verbose reload warning via aria-label */ ?>
       <a class="reset-filters-btn" href="<?=$resetLink?>"
          aria-label="<?=$this->transEsc('clear_tag_filter') ?> &ndash; <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>"
@@ -148,7 +148,7 @@
   <?php // Narrow view ?>
   <div class="active-filters visible-xs">
     <div class="filters-toggle-bar">
-      <?php if ($resetLink && $options->getRetainFilterSetting()): ?>
+      <?php if ($resetLink && !empty($value) && $options->getRetainFilterSetting()): ?>
         <?php /* finc adds verbose reload warning via aria-label */ ?>
         <a class="reset-filters-btn active" href="<?=$resetLink?>"
            aria-label="<?=$this->transEsc('clear_tag_filter') ?> &ndash; <?=$this->transEsc('page_reload_on_deselect_all_hint', ['%%filter_name%%' => $value['displayText']])?>">