diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 08ce667cc..0ef4811f8 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -221,6 +221,10 @@ $conf['links'] = array();
 //    );
 $conf['random_index_redirect'] = array();
 
+// reverse_home_title: if Piwigo is your home page for a better robot index
+// we recommend to set it true (Only index page will reverse its title)
+$conf['reverse_home_title'] = false;
+
 // List of notes to display on all header page
 // example $conf['header_notes']  = array('Test', 'Hello');
 $conf['header_notes']  = array();
diff --git a/include/page_header.php b/include/page_header.php
index 6c157a5ec..6b9fcfffe 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -43,6 +43,10 @@ $template->assign(
       isset($page['body_id']) ?
         $page['body_id'] : '',
 
+    'REVERSE' =>
+      (isset($conf['reverse_home_title']) and $conf['reverse_home_title']) ?
+        true : false,
+
     'CONTENT_ENCODING' => get_pwg_charset(),
     'PAGE_TITLE' => strip_tags($title),
 
diff --git a/plugins/language_switch/icons/hr-HR.gif b/plugins/language_switch/icons/hr-HR.gif
new file mode 100644
index 000000000..08b574745
Binary files /dev/null and b/plugins/language_switch/icons/hr-HR.gif differ
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index c64ae5959..668d7c505 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -18,7 +18,9 @@
 {/if}
 {/if}
 
-<title>{$GALLERY_TITLE} :: {$PAGE_TITLE}</title>
+{if (isset($REVERSE) and $REVERSE and $PAGE_TITLE == l10n('home'))}
+<title>{$GALLERY_TITLE} | {$PAGE_TITLE}</title>{else}
+<title>{$PAGE_TITLE} | {$GALLERY_TITLE}</title>{/if}
 <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
 
 <link rel="start" title="{'home'|@translate}" href="{$U_HOME}" >