diff --git a/css/light-grey.css b/css/light-grey.css
index 6acfcd7b7..98857d7c9 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -768,7 +768,12 @@ input.dp-applied {
 .search_form_handler .sf_title > span {
   margin-right: 10px;
 }
+.search_form_handler .sf_title .sft_refresh {
+  font-size: 10pt;
+  line-height: 13pt;
+}
 .search_form_handler .sf_title .sft_toggler {
+  margin-left: 0.7em;
   transition: all 0.4s ease-in-out;
 }
 .search_form_handler .sf_criterion_area {
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 80a7f6b18..23d8f3b82 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -858,7 +858,12 @@ input.dp-applied {
 			margin-right: 10px;
 		}
 
+		.sft_refresh{
+			font-size: 10pt;
+			line-height: 13pt;
+		}
 		.sft_toggler{
+			margin-left: 0.7em;
 			transition: all 0.4s ease-in-out;
 		}
 	}
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index 4bc726047..89ff6f999 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -217,6 +217,10 @@ $(function()
 		{
 			var me = this;
 
+			this.element.find('.sft_refresh').on('click', function(oEvent){
+				oEvent.preventDefault();
+				me._submit();
+			});
 			// TODO: UX Improvment
 			// Note: Would be better to toggle by clicking on the whole title, but we have an issue with <select> on abstract classes.
 			this.element.find('.sft_toggler').on('click', function(oEvent){
@@ -347,8 +351,15 @@ $(function()
 			}
 			else
 			{
-				// TODO: Change this so it appears after the search drawer.
-				oResultAreaElem = $('<div></div>').appendTo(this.element);
+				// Reusing previously created DOM element
+				if(this.element.closest('.display_block').next('.sf_results_area').length > 0)
+				{
+					oResultAreaElem = this.element.closest('.display_block').next('.sf_results_area');
+				}
+				else
+				{
+					oResultAreaElem = $('<div></div>').insertAfter(this.element.closest('.display_block'));
+				}
 			}
 			oResultAreaElem.addClass('sf_results_area');
 
@@ -551,14 +562,12 @@ $(function()
 		// - Show loader
 		_showLoader: function()
 		{
-			// TODO: Show loader
-			this._trace('Show loader');
+			this.elements.results_area.block();
 		},
 		// - Hide loader
 		_hideLoader: function()
 		{
-			// TODO: Hide loader
-			this._trace('Hide loader');
+			this.elements.results_area.unblock();
 		},
 		// - Converts a snake_case string to CamelCase
 		_toCamelCase: function(sString)
diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php
index 69fcddc62..96f8c903f 100644
--- a/sources/application/search/searchform.class.inc.php
+++ b/sources/application/search/searchform.class.inc.php
@@ -117,7 +117,7 @@ class SearchForm
 		$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
 		$sStyle = (isset($aExtraParams['open']) && ($aExtraParams['open'] == 'true')) ? 'opened' : '';
 		$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
-		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a></h2>\n";
+		$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
 		$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
 		$sHtml .= "</div>\n";