4 files changed, 32 insertions, 20 deletions
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 79643ba26..c360b2600 100755
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -168,26 +168,22 @@ $template->assign_block_vars(
     'NAME' => $lang['random_cat']
     ));
 
-// Not recent menu when filter is activated
-if (!$page['filter_mode'])
-{
-  // recent pics
-  $template->assign_block_vars(
-    'special_cat',
-    array(
-      'URL' => make_index_url(array('section' => 'recent_pics')),
-      'TITLE' => $lang['recent_pics_cat_hint'],
-      'NAME' => $lang['recent_pics_cat']
-      ));
-  // recent cats
-  $template->assign_block_vars(
-    'special_cat',
-    array(
-      'URL' => make_index_url(array('section' => 'recent_cats')),
-      'TITLE' => $lang['recent_cats_cat_hint'],
-      'NAME' => $lang['recent_cats_cat']
-      ));
-}
+// recent pics
+$template->assign_block_vars(
+  'special_cat',
+  array(
+    'URL' => make_index_url(array('section' => 'recent_pics')),
+    'TITLE' => $lang['recent_pics_cat_hint'],
+    'NAME' => $lang['recent_pics_cat']
+    ));
+// recent cats
+$template->assign_block_vars(
+  'special_cat',
+  array(
+    'URL' => make_index_url(array('section' => 'recent_cats')),
+    'TITLE' => $lang['recent_cats_cat_hint'],
+    'NAME' => $lang['recent_cats_cat']
+    ));
 
 // calendar
 $template->assign_block_vars(
diff --git a/template/yoga/icon/stop_filter_mode.png b/template/yoga/icon/stop_filter_mode.png
index 1ac3aa0e7..1ff012e96 100644
--- a/template/yoga/icon/stop_filter_mode.png
+++ b/template/yoga/icon/stop_filter_mode.png
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index cfa1a2205..814f19a73 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -12,6 +12,16 @@
     margin: 0; padding: 0; display: block;
 }
 
+#menubar .buttonmenu {
+  margin: 0 2px;
+  width: auto;
+  padding: 0;
+  text-indent: 0;
+  list-style: none;
+  text-align: center;
+  float: right;
+}
+
 /* H2 properties copied here */
 #menubar DT {
     font-weight: bold; /* default for h2 */
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 6066d18d2..eecf72aac 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -13,6 +13,12 @@
 </dl>
 <!-- END links -->
 <dl id="mbCategories">
+  <!-- BEGIN start_filter_mode -->
+  <a href="{start_filter_mode.URL}" title="{lang:start_filter_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/start_filter_mode.png" class="buttonmenu" alt="{lang:start_filter_mode_hint}"></a>
+  <!-- END start_filter_mode -->
+  <!-- BEGIN stop_filter_mode -->
+  <a href="{stop_filter_mode.URL}" title="{lang:stop_filter_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter_mode.png" class="buttonmenu" alt="{lang:stop_filter_mode_hint}"></a>
+  <!-- END stop_filter_mode -->
   <dt><a href="{U_HOME}">{lang:Categories}</a></dt>
   <dd>
     {MENU_CATEGORIES_CONTENT}