diff --git a/admin/configuration.php b/admin/configuration.php
index b4f438672..4d04f8a98 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -76,7 +76,6 @@ $display_checkboxes = array(
     'menubar_filter_icon',
     'index_search_in_set_button',
     'index_search_in_set_action',
-    'index_related_tags_display',
     'index_sort_order_input',
     'index_flat_icon',
     'index_posted_date_icon',
diff --git a/admin/themes/default/template/configuration_display.tpl b/admin/themes/default/template/configuration_display.tpl
index 1b49c2ccb..fe31f857d 100644
--- a/admin/themes/default/template/configuration_display.tpl
+++ b/admin/themes/default/template/configuration_display.tpl
@@ -56,14 +56,6 @@
         </label>
       </li>
 
-      <li>
-        <label class="font-checkbox">
-          <span class="icon-check"></span>
-          <input type="checkbox" name="index_related_tags_display" {if ($display.index_related_tags_display)}checked="checked"{/if}>
-          {'Display related tags by default'|translate}
-        </label>
-      </li>
-
       <li>
         <label class="font-checkbox">
           <span class="icon-check"></span>
diff --git a/index.php b/index.php
index 946fd0315..e41003c01 100644
--- a/index.php
+++ b/index.php
@@ -226,8 +226,7 @@ if ( empty($page['is_external']) )
         'SEARCH_IN_SET_BUTTON' => $conf['index_search_in_set_button'],
         'SEARCH_IN_SET_ACTION' => $conf['index_search_in_set_action'],
         'SEARCH_IN_SET_URL' => get_root_url().'search.php?tag_id='.implode(',', $page['body_data']['tag_ids']),
-        'RELATED_TAGS_DISPLAY' => $conf['index_related_tags_display'],
-        'RELATED_TAGS' => $related_tags,
+        'COMBINABLE_TAGS' => $related_tags,
       )
     );
   }
diff --git a/install/config.sql b/install/config.sql
index 5f872037c..a12d2b3f0 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -80,5 +80,4 @@ INSERT INTO piwigo_config (param,value) VALUES ('index_search_in_set_action','tr
 INSERT INTO piwigo_config (param,value) VALUES ('upload_detect_duplicate','true');
 INSERT INTO piwigo_config (param,value) VALUES ('webmaster_id','1');
 INSERT INTO piwigo_config (param,value) VALUES ('use_standard_pages','true');
-INSERT INTO piwigo_config (param,value,comment) VALUES ('filters_views','a:14:{s:5:"words";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:4:"tags";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"post_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:13:"creation_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:5:"album";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:6:"author";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:8:"added_by";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_type";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"ratio";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"rating";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_size";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"height";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"width";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:17:"last_filters_conf";b:1;}','Filters displays configuration');
-INSERT INTO piwigo_config (param,value) VALUES ('index_related_tags_display','true');
\ No newline at end of file
+INSERT INTO piwigo_config (param,value,comment) VALUES ('filters_views','a:14:{s:5:"words";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:4:"tags";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"post_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:13:"creation_date";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:5:"album";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:1;}s:6:"author";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:8:"added_by";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_type";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"ratio";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"rating";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:9:"file_size";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:6:"height";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:5:"width";a:2:{s:6:"access";s:9:"everybody";s:7:"default";b:0;}s:17:"last_filters_conf";b:1;}','Filters displays configuration');
\ No newline at end of file
diff --git a/install/db/180-database.php b/install/db/180-database.php
index 56591b85e..f1c37be18 100644
--- a/install/db/180-database.php
+++ b/install/db/180-database.php
@@ -11,10 +11,12 @@ if (!defined('PHPWG_ROOT_PATH'))
   die('Hacking attempt!');
 }
 
-$upgrade_description = 'add config parameters to display by default or not "related tags" ';
-
-conf_update_param('index_related_tags_display', true);
-
-echo "\n".$upgrade_description."\n";
+$upgrade_description = 'add config parameters to display by default or not "related tags" [Aborted] ';
 
+//The contents of the database upgrade have been emptied 
+//due to the fact that we decicded to not use this configuration
+//in the end for the related tags display
+//We need to keep this database ugrapde to avoid errors 
+//for those that have already passed the "180"th upgrade.
+//This database upgrade now does nothing.
 ?>
diff --git a/themes/default/template/include/related_tags.inc.tpl b/themes/default/template/include/related_tags.inc.tpl
index fefcc7a5b..568e2c6fb 100644
--- a/themes/default/template/include/related_tags.inc.tpl
+++ b/themes/default/template/include/related_tags.inc.tpl
@@ -1,10 +1,6 @@
-<div class="mcs-side-results search-in-set-button" id="related-tags-toggle">
-  <div>
-    <p>{'Related tags'|translate}<i class="gallery-icon-up-open rotated"></i></p>
-  </div>
-</div>
+<h3 class="related-tags-title">{'Related tags'|translate}</h3>
 
-{foreach from=$RELATED_TAGS item=tag}
+{foreach from=$COMBINABLE_TAGS item=tag}
 <span class="related-tags {if isset($RELATED_TAGS_DISPLAY) and $RELATED_TAGS_DISPLAY == false} hide{/if}">{strip}
   <a class="tagLevel {if isset($tag.level)}{$tag.level}{/if}" href=
   {if isset($tag.U_ADD)}
@@ -12,16 +8,5 @@
   {else}
     "{$tag.URL}" title="{'display photos linked to this tag'|@translate}">
   {/if}
-    + {$tag.name}</a><div class="tag-counter">{$tag.counter}</div></span>{/strip}
-{/foreach}
-
-{footer_script require='jquery'}
-
-$(document).ready(function () { 
-  $('#related-tags-toggle').on("click", function (e) { 
-    $('.related-tags').toggle();
-    $('#related-tags-toggle .gallery-icon-up-open').toggleClass('rotated'); 
-  }); 
-});
-
-{/footer_script}
\ No newline at end of file
+    + {$tag.name}<div class="tag-counter">{$tag.counter}</div></a></span>{/strip}
+{/foreach}
\ No newline at end of file
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index 5331bb7be..9a4d1be6e 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -192,8 +192,9 @@
   </div>
 {/if}
 
+{if isset($COMBINABLE_TAGS)}
 {include file='include/related_tags.inc.tpl'}
-
+{/if}
 </div>
 
 {if !empty($CONTENT_DESCRIPTION)}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index e58b73a88..245723726 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -879,7 +879,7 @@ because of this it needs to specifically be added to each theme */
   display: flex;
   align-items: center;
   cursor: pointer;
-  margin-right: 10px;
+  margin-right: 15px;
   color: #ccc;
   width: fit-content;
 }
@@ -908,7 +908,6 @@ because of this it needs to specifically be added to each theme */
   font-size: 10px;
   background: #777;
 }
-
 .action-buttons{
   display:flex;
   align-items:start;
@@ -917,38 +916,34 @@ because of this it needs to specifically be added to each theme */
   padding:0 15px;
 }
 
-#related-tags-toggle i{
-  margin-left:5px;
-}
-
-#related-tags-toggle i::before {
-  transition: transform 0.3s ease;
-}
-
-#related-tags-toggle i.rotated::before {
-  transform: rotate(90deg);
-} 
-
-.related-tags.hide{
-  display:none;
+h3.related-tags-title{
+  margin:4px 0;
+  margin-right:10px;
+  font-weight:400;
 }
 
 span.related-tags{
-  padding:3px 5px;
-  border:1px solid #D6D6D6;
+  padding:4px 12px;
   margin:3px;
   border-radius:15px;
+  background-color:#f5f5f5
 }
 
 span.related-tags a{
   font-weight:700;
   color:#787878;
+  text-decoration:none;
+}
+
+span.related-tags:hover{
+  background-color:#e5e5e5;
 }
 
 span.related-tags .tag-counter{
   display: inline-block;
-  margin-left: 7px;
-  color:#D6D6D6;
+  margin-left:9px;
+  color:#ACACAC;
+  font-weight:700;
 }
 
 #relatedTagsBox.switchBox A {