diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index 1acacbd6e..39e519b34 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -690,7 +690,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 .addFilesButtonChanged:hover {background-color: #BBB;}
 
 #checkActions a, .deleteDerivButtons a {background-color: #E8E8E8;}
-#addFilter, #filterList select, .pictureLevels select, #permitAction select {background-color: #FFF; color: #4E4E4E; border: 2px solid #7070704f !important; outline: none !important;}
+#filterList select, .pictureLevels select, #permitAction select {background-color: #FFF; color: #4E4E4E; border: 2px solid #7070704f !important; outline: none !important;}
 #filter_category .selectize-input.items.full.has-options.has-items, #filter_tags .selectize-input.items.not-full.has-options,
 #filter_tags .selectize-input.items.not-full, #filter_search input, #action_associate .selectize-input.items.full.has-options.has-items,
 #action_dissociate .selectize-input.items.full.has-options.has-items {
@@ -699,7 +699,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
   color: #3C3C3CBD;
 }
 #action_associate a:last-child {background: #FFF; border: 1px solid #787777a6; box-shadow: none;}
-#forbidAction, .selectionEmptyBlock {background-color: #f3f3f3;}
+#forbidAction, .selectionEmptyBlock, .noFilter {background-color: #f3f3f3;}
 #action_title .large, #action_author .large {background-color: #FFF; color: #4E4E4E;}
 #filter_dimension .slider-choice, #filter_filesize .slider-choice {background-color: #EEE; color: #777;}
 #filter_dimension .slider-choice:hover, #filter_filesize .slider-choice:hover, .dimension-cancel:hover {
diff --git a/admin/themes/default/js/batchManagerGlobal.js b/admin/themes/default/js/batchManagerGlobal.js
index f7693c6ae..41bda0fe7 100644
--- a/admin/themes/default/js/batchManagerGlobal.js
+++ b/admin/themes/default/js/batchManagerGlobal.js
@@ -8,7 +8,10 @@ function filter_enable(filter) {
 	$("input[type=checkbox][name="+filter+"_use]").prop("checked", true);
 
 	/* forbid to select this filter in the addFilter list */
-	$("#addFilter").find("option[value="+filter+"]").attr("disabled", "disabled");
+  $("#addFilter").find("a[data-value="+filter+"]").addClass("disabled", "disabled");
+  
+  /* hide the no filter message */
+  $('.noFilter').hide();
 }
 
 function filter_disable(filter) {
@@ -19,7 +22,13 @@ function filter_disable(filter) {
 	$("input[name="+filter+"_use]").prop("checked", false);
 
 	/* give the possibility to show it again */
-	$("#addFilter").find("option[value="+filter+"]").removeAttr("disabled");
+  $("#addFilter").find("a[data-value="+filter+"]").removeClass("disabled");
+  
+  /* show the no filter message if no filter selected */
+  if ($('#filterList li:visible').length == 0) {
+    $('.noFilter').show();
+  }
+  
 }
 
 $(".removeFilter").addClass("icon-cancel-circled");
@@ -31,10 +40,9 @@ $(".removeFilter").click(function () {
 	return false;
 });
 
-$("#addFilter").change(function () {
-	var filter = $(this).prop("value");
+$("#addFilter a").on('click', function () {
+	var filter = $(this).attr("data-value");
 	filter_enable(filter);
-	$(this).prop("value", -1);
 });
 
 $("#removeFilters").click(function() {
@@ -51,6 +59,13 @@ $('[data-slider=ratios]').pwgDoubleSlider(sliders.ratios);
 $('[data-slider=filesizes]').pwgDoubleSlider(sliders.filesizes);
 
 
+$(document).mouseup(function (e) {
+  e.stopPropagation();
+  if (!$(event.target).hasClass('addFilter-button')) {
+    $('.addFilter-dropdown').slideUp();
+  }
+});
+
 /* ********** Thumbs */
 
 /* Shift-click: select all photos between the click and the shift+click */
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 529d7ec01..311124c64 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -333,32 +333,9 @@ var sliders = {
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
   <fieldset>
-    <legend><span class='icon-th icon-blue'></span>{'Filter'|@translate}</legend>
+    <legend><span class='icon-filter icon-green'></span>{'Filter'|@translate}</legend>
 
     <div class="filterBlock">
-      <div class="actionButtonsBlock">
-        <p class="actionButtons">
-          <select id="addFilter">
-            <option value="-1">{'Add a filter'|@translate}</option>
-            <option disabled="disabled">------------------</option>
-            <option value="filter_prefilter" {if isset($filter.prefilter)}disabled="disabled"{/if}>{'Predefined filter'|@translate}</option>
-            <option value="filter_category" {if isset($filter.category)}disabled="disabled"{/if}>{'Album'|@translate}</option>
-            <option value="filter_tags" {if isset($filter.tags)}disabled="disabled"{/if}>{'Tags'|@translate}</option>
-            <option value="filter_level" {if isset($filter.level)}disabled="disabled"{/if}>{'Privacy level'|@translate}</option>
-            <option value="filter_dimension" {if isset($filter.dimension)}disabled="disabled"{/if}>{'Dimensions'|@translate}</option>
-            <option value="filter_filesize" {if isset($filter.filesize)}disabled="disabled"{/if}>{'Filesize'|@translate}</option>
-    				<option value="filter_search"{if isset($filter.search)} disabled="disabled"{/if}>{'Search'|@translate}</option>
-          </select>
-          <a id="removeFilters" class="icon-cancel" style="display: none;">{'Remove all filters'|@translate}</a>
-        </p>
-
-        <p class="actionButtons" id="applyFilterBlock">
-          <button id="applyFilter" name="submitFilter" type="submit">
-            <i class="icon-arrows-cw"></i> {'Refresh photo set'|@translate}
-          </button>
-        </p>
-      </div>
-
       <ul id="filterList">
         <li id="filter_prefilter" {if !isset($filter.prefilter)}style="display:none"{/if}>
           <input type="checkbox" name="filter_prefilter_use" class="useFilterCheckbox" {if isset($filter.prefilter)}checked="checked"{/if}>
@@ -529,13 +506,35 @@ var sliders = {
           </blockquote>
         </li>
       </ul>
+
+      <div class='noFilter'>{'No filter, add one'|@translate}</div>
+
+      <div class="filterActions">
+        <div id="addFilter">
+          <div class="addFilter-button icon-plus" onclick="$('.addFilter-dropdown').slideToggle()">{'Add a filter'|@translate}</div>
+          <div class="addFilter-dropdown">
+            <a data-value="filter_prefilter" {if isset($filter.prefilter)}class="disabled"{/if}>{'Predefined filter'|@translate}</a>
+            <a data-value="filter_category" {if isset($filter.category)}class="disabled"{/if}>{'Album'|@translate}</a>
+            <a data-value="filter_tags" {if isset($filter.tags)}class="disabled"{/if}>{'Tags'|@translate}</a>
+            <a data-value="filter_level" {if isset($filter.level)}class="disabled"{/if}>{'Privacy level'|@translate}</a>
+            <a data-value="filter_dimension" {if isset($filter.dimension)}class="disabled"{/if}>{'Dimensions'|@translate}</a>
+            <a data-value="filter_filesize" {if isset($filter.filesize)}class="disabled"{/if}>{'Filesize'|@translate}</a>
+            <a data-value="filter_search"{if isset($filter.search)} class="disabled"{/if}>{'Search'|@translate}</a>
+          </div>
+          <a id="removeFilters" class="icon-cancel" style="display: none;">{'Remove all filters'|@translate}</a>
+        </div>
+
+        <button id="applyFilter" name="submitFilter" type="submit">
+          <i class="icon-arrows-cw"></i> {'Refresh photo set'|@translate}
+        </button>
+      </div>
     </div>
 
   </fieldset>
 
   <fieldset>
 
-    <legend><span class='icon-filter icon-green'></span>{'Selection'|@translate}</legend>
+    <legend><span class='icon-check icon-blue '></span>{'Selection'|@translate}</legend>
 
   {if !empty($thumbnails)}
   <p id="checkActions">
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index e4b53d708..d14ff5d86 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -314,7 +314,7 @@ jQuery(document).ready(function(){
     <fieldset class="selectFiles">
       <legend>{'Select files'|@translate}</legend>
       <div class="selectFilesButtonBlock">
-        <button id="addFiles" class="buttonLike">{'Add Photos'|translate}<i class="icon-plus-circled"></i></button>
+        <button id="addFiles" class="buttonGradient">{'Add Photos'|translate}<i class="icon-plus-circled"></i></button>
         <div class="selectFilesinfo">
           {if isset($original_resize_maxheight)}
           <p class="uploadInfo">{'The picture dimensions will be reduced to %dx%d pixels.'|@translate:$original_resize_maxwidth:$original_resize_maxheight}</p>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 8d20a7788..dbf0e34f5 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1841,7 +1841,7 @@ LEGEND {
 }
 
 #batchManagerGlobal legend {
-  font-size: 20px;
+  font-size: 14px;
   color: #444;
   margin: 10px 0;
   padding: 0;
@@ -1851,15 +1851,15 @@ LEGEND {
   padding: 5px;
   border-radius: 100%;
   margin-right: 6px;
-  font-size: 18px;
+  font-size: 16px;
 }
 
 #batchManagerGlobal ul.thumbnails div.actions a {color:#fff;}
 #batchManagerGlobal ul.thumbnails span.wrap1:hover div.actions {display:flex;}
 #batchManagerGlobal #selectedMessage {padding:5px; border-radius:5px; float: right;}
 #batchManagerGlobal #applyOnDetails {text-align: center; margin-top: 8px; color: #FFA646; font-weight: bold;}
-#batchManagerGlobal .actionButtons {text-align:left; margin: 0; display: flex; flex-direction: column;}
-#batchManagerGlobal #filterList {padding-left:15px; display: flex; flex-wrap: wrap; align-items: start; margin-top: 0px;}
+#batchManagerGlobal .actionButtons {text-align:left; display: flex; flex-direction: column;}
+#batchManagerGlobal #filterList {padding-left:0px; display: flex; flex-wrap: wrap; align-items: start; margin-top: 0px;}
 #batchManagerGlobal #filterList li {
   list-style-type:none;
   background-color: #fafafa;
@@ -1879,7 +1879,7 @@ LEGEND {
 #batchManagerGlobal a.removeFilter:hover::before {color: #ffa646;}
 #batchManagerGlobal a.removeFilter:hover {color:red;}
 #batchManagerGlobal .removeFilter span {display:none}
-#batchManagerGlobal #applyFilterBlock {margin-top:20px; width: 200px;}
+#batchManagerGlobal #applyFilterBlock {width: 200px;}
 #batchManagerGlobal .useFilterCheckbox {display:none;}
 
 #batchManagerGlobal blockquote {margin:10px 0 0px 0;}
@@ -1904,7 +1904,79 @@ LEGEND {
   justify-content: space-between;
 }
 
-#order_filters a.addFilter {font-weight:normal;margin-left:20px;}
+.noFilter {
+  text-align: center;
+  font-weight: 600;
+  padding: 27px 0;
+  margin-bottom: 30px;
+  display: none;
+}
+
+.filterActions {
+  display: flex;
+}
+
+.filterActions #addFilter {
+  position: relative;
+  margin-right: 10px;
+}
+
+.filterActions .addFilter-button {
+  margin-left: 0;
+  float: left;
+  height: 45.6px;
+  font-size: 1em;
+  border: none;
+  cursor: pointer;
+  transition: ease 0.2s;
+  background-color: #ff9b32;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  padding: 0px 8px;
+  color: white;
+  justify-content: center;
+}
+
+.filterActions .addFilter-button:hover {
+background-color: #ff7700
+}
+
+.addFilter-dropdown {
+  z-index: 100;
+  padding: 5px 0px;
+  border-radius: 10px 10px 0px 0px;
+  background: linear-gradient(130deg, #ff7700 0%, #ffa744 100%);
+  color: white;
+  position: absolute;
+  bottom:100%;
+  overflow: hidden;
+  width: 100%;
+  display: none;
+}
+
+.addFilter-dropdown a {
+  display: block;
+  text-align: initial;
+  padding: 5px 10px;
+  font-size: 12px;
+  padding-right: 15px;
+  color: white;
+  font-weight: 600;
+  cursor: pointer;
+}
+
+.addFilter-dropdown a:hover {
+  text-decoration: none;
+  color: white;
+  background-color: rgba(0, 0, 0, 0.123)
+}
+
+.addFilter-dropdown a.disabled {
+  pointer-events: none;
+  opacity: 0.5;
+}
+
 #order_filters a.removeFilter {font-weight:normal;}
 #order_filters span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */
 #order_filters span.filter {display:block;margin-left:20px;}
@@ -3851,10 +3923,20 @@ fieldset#environment legend i[class*="icon-"] {
   }
 }
 
-.buttonLike, input[type="submit"], input[type="button"], input[type="reset"] {
+.buttonLike, .buttonGradient, input[type="submit"], input[type="button"], input[type="reset"] {
  font-size:12px; border:none; padding:13px 20px; margin-left:0; font-weight: bold; transition: all 125ms ease-out;
 }
 
+.buttonGradient {
+  padding: 8px 10px; margin-left: 5px;
+  background: linear-gradient(135deg, rgba(255,119,0,1) 0%, rgba(249,76,93,1) 50%, rgba(201,74,140,1) 100%);
+  transition: 0.3s ease; 
+  cursor: pointer;
+  color: white !important;
+}
+
+.buttonGradient:hover {filter: brightness(1.2);}
+
 #cboxLoadedContent input[type="submit"] {margin-bottom: 20px; float: none;}
 
 .selectAlbum, #permissions, .selectFiles {border: 0;}
@@ -3917,14 +3999,14 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 .plupload_filelist_footer {display: none;}
 
 .permitActionListButton .actionButtons {display: flex; flex-direction: column;}
-.filterBlock {display: flex;}
+.filterBlock {display: flex; flex-direction: column;}
 .filterBlock li {width: 300px; height: auto;}
 #filter_dimension {width: 600px;}
 #filter_dimension .slider-choice, #filter_filesize .slider-choice {border-radius: 4px; padding: 2px 8px; margin: 0 3px;}
 #checkActions a {background-color: #f0f0f0;padding: 6px 10px;color: #777;font-weight: bold;margin: 4px;border-radius: 5px;}
 #filterList select {display: block; padding: 10px 18px; margin-bottom: 5px; width: 290px;}
 #filterList li {margin-left: 25px; margin-bottom: 15px;}
-#addFilter, #filter_tags .selectize-input.items.not-full.has-options, #filter_tags .selectize-input.items.not-full {padding: 10px 18px;}
+#filter_tags .selectize-input.items.not-full.has-options, #filter_tags .selectize-input.items.not-full {padding: 10px 18px;}
 #filter_tags .selectize-input {width: 300px; box-shadow: none; border-radius: inherit;}
 #filter_tags .selectize-control.multi.plugin-remove_button {width: 300px !important;}
 #filter_category .selectize-input.items.full.has-options.has-items {padding: 10px 18px; width: 610px; margin-bottom: 5px;}
@@ -3947,15 +4029,13 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 .deleteDerivButtons {margin-bottom: 15px; margin-right: 51px; width: 100%; text-align: center;}
 #action_delete_derivatives label, #action_generate_derivatives label {display: flex; margin-top: 4px; width: 50%;}
 #action_delete_derivatives input[name="del_derivatives_type[]"], #action_generate_derivatives input[name="generate_derivatives_type[]"] {margin-right: 3px;}
-.actionButtonsBlock .actionButtons:first-child::after,#filter_prefilter::before,#filter_category::before,#filter_level::before,
+.actionButtons:first-child::after,#filter_prefilter::before,#filter_category::before,#filter_level::before,
 .permitActionListButton div::before, #action_level::after, .pictureLevels::before {
   content: '\e835'; font-size: 17px; position: absolute; font-family: "fontello"; color: #6E6E6E; pointer-events: none;
 }
 .permitActionListButton div::before {margin-left: 250px; margin-top: 11px;}
 .pictureLevels::before {margin-left: 216px; margin-top: 10px;}
 .permitActionListButton div.hidden::after {display: none;}
-.actionButtonsBlock {width: 200px;}
-.actionButtonsBlock .actionButtons:first-child::after {margin-left: 169px; margin-top: 11px;}
 #filter_prefilter::before {margin-left: 257px; margin-top: 35px;}
 #filter_category .selectize-control.single .selectize-input::after {content: none;}
 #filter_category {width: 600px;}
@@ -3963,7 +4043,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 #filter_level::before {margin-top: 34px; margin-left: 260px;}
 #action_level::after {margin-top: -56px; margin-left: 254px;}
 #filter_search input {width: 300px; box-sizing: border-box; padding: 11px 18px;}
-#addFilter, #applyFilter,#filterList select, #filter_tags .selectize-input.items.not-full.has-options, .pictureLevels select, #permitAction select{
+#applyFilter,#filterList select, #filter_tags .selectize-input.items.not-full.has-options, .pictureLevels select, #permitAction select{
 	font-family: "Open Sans", "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
 	-webkit-appearance: none;
 	font-weight: 700;
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index c7376bbd0..c6d8bc739 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -833,12 +833,11 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
   color: #C0C0C0;
 }
 #action_associate a:last-child {color: #C0C0C0; background-color: #464646;}
-#forbidAction, .selectionEmptyBlock {background-color: #f3f3f3;}
 #filter_dimension .slider-choice, #filter_filesize .slider-choice {background-color: #393939;}
 #filter_dimension .slider-choice:hover, #filter_filesize .slider-choice:hover, .dimension-cancel:hover {
   text-decoration: none; background-color: #ffa646 !important; color: initial;
 }
-#forbidAction, .selectionEmptyBlock {background-color: #5a5757; color: #c1c1c1;}
+#forbidAction, .selectionEmptyBlock, .noFilter {background-color: #5a5757; color: #c1c1c1;}
 
 .pageNumberSelected {background-color: #b4b4b4;}
 #action_title .large, #action_author .large {background-color: #333; color: #fefefe;}
@@ -862,6 +861,14 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
 #batchManagerGlobal .ui-slider .ui-slider-range {background-color: #aaaaaa;}
 #batchManagerGlobal .ui-slider-range.ui-widget-header.ui-corner-all {border: 1px solid #ffaf58; background-color: #ffaf58;}
 
+#batchManagerGlobal #applyFilter {
+  color: #BFBFBF;
+  background-color: #3c3c3c;
+}
+
+#batchManagerGlobal #applyFilter:hover {
+  background-color: #202020;
+}
 /*Error message*/
 
 .errors {