Merge branch 'release-2.4'

Conflicts:
	themes/bootstrap3/templates/search/results.phtml

themes/bootstrap3/templates/search/history.phtml

@@ -17,6 +17,7 @@
     <h2><?=$this->transEsc("history_recent_searches")?></h2>
     <? if (!empty($this->unsaved)): ?>
       <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => false));?>
+      <a href="?purge=true"><i class="fa fa-remove"></i> <?=$this->transEsc("history_purge")?></a>
     <? else: ?>
       <?=$this->transEsc("history_no_searches")?>
     <? endif; ?>

themes/bootstrap3/templates/search/results.phtml

@@ -115,9 +115,9 @@
           —
           <? if (is_numeric($this->results->getSearchId())): ?>
             <? if ($this->results->isSavedSearch()): ?>
-              <i class="fa fa-minus-square"></i> <a href="<?=$this->url('myresearch-savesearch')?>?delete=<?=urlencode($this->results->getSearchId())?>"><?=$this->transEsc('save_search_remove')?></a>
+              <i class="fa fa-remove"></i> <a href="<?=$this->url('myresearch-savesearch')?>?delete=<?=urlencode($this->results->getSearchId())?>"><?=$this->transEsc('save_search_remove')?></a>
             <? else: ?>
-              <i class="fa fa-plus-square"></i> <a href="<?=$this->url('myresearch-savesearch')?>?save=<?=urlencode($this->results->getSearchId())?>"><?=$this->transEsc('save_search')?></a>
+              <i class="fa fa-save"></i> <a href="<?=$this->url('myresearch-savesearch')?>?save=<?=urlencode($this->results->getSearchId())?>"><?=$this->transEsc('save_search')?></a>
             <? endif; ?>
           <? endif; ?>
         <? endif; ?>