diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl
index c964cb1b0..241a33595 100755
--- a/admin-dev/themes/default/template/controllers/login/content.tpl
+++ b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -178,7 +178,7 @@
 	<div id="login-footer" class="animated fadeIn">
 		<p class="text-center text-muted">
 			<a href="http://www.prestashop.com/">
-				&copy; PrestaShop 2005-{$smarty.now|date_format:"%Y"} - All rights reserved.
+				&copy; PrestaShop&#8482; 2005-{$smarty.now|date_format:"%Y"} - All rights reserved
 			</a>
 		</p>
 		<p class="text-center">
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 5a2abcbfb..dda56cfa2 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -224,39 +224,39 @@
 								<i class="icon-caret-down"></i>
 							</button>
 							<ul id="header_search_options" class="dropdown-menu">
-								<li class="search-all search-option active"><a href="#" data-value="0" data-placeholder="{l s='TODO'}"><i class="icon-search"></i> {l s='Everywhere'}</a></li>
+								<li class="search-all search-option active"><a href="#" data-value="0" data-placeholder="{l s='What are you looking for?'}"><i class="icon-search"></i> {l s='Everywhere'}</a></li>
 								<li class="divider"></li>
 								<li class="search-book search-option">
-									<a href="#" data-value="1" data-placeholder="{l s='TODO'}" data-icon="icon-book">
+									<a href="#" data-value="1" data-placeholder="{l s='Product name, SKU, reference...'}" data-icon="icon-book">
 										<i class="icon-book"></i> {l s='Catalog'}
 									</a>
 								</li>
 								<li class="search-customers-name search-option">
-									<a href="#" data-value="2" data-placeholder="{l s='TODO'}" data-icon="icon-group">
+									<a href="#" data-value="2" data-placeholder="{l s='Email, name...'}" data-icon="icon-group">
 										<i class="icon-group"></i> {l s='Customers'} {l s='by name'}
 									</a>
 								</li>
 								<li class="search-customers-addresses search-option">
-									<a href="#" data-value="6" data-placeholder="{l s='TODO'}" data-icon="icon-desktop">
+									<a href="#" data-value="6" data-placeholder="{l s='123.45.67.89'}" data-icon="icon-desktop">
 										<i class="icon-desktop"></i> {l s='Customers'} {l s='by ip address'}</a>
 								</li>
 								<li class="search-orders search-option">
-									<a href="#" data-value="3" data-placeholder="{l s='TODO'}" data-icon="icon-credit-card">
+									<a href="#" data-value="3" data-placeholder="{l s='Order ID'}" data-icon="icon-credit-card">
 										<i class="icon-credit-card"></i> {l s='Orders'}
 									</a>
 								</li>
 								<li class="search-invoices search-option">
-									<a href="#" data-value="4" data-placeholder="{l s='TODO'}" data-icon="icon-book">
+									<a href="#" data-value="4" data-placeholder="{l s='Invoice Number'}" data-icon="icon-book">
 										<i class="icon-book"></i> {l s='Invoices'}
 									</a>
 								</li>
 								<li class="search-carts search-option">
-									<a href="#" data-value="5" data-placeholder="{l s='TODO'}" data-icon="icon-shopping-cart">
+									<a href="#" data-value="5" data-placeholder="{l s='Cart ID'}" data-icon="icon-shopping-cart">
 										<i class="icon-shopping-cart"></i> {l s='Carts'}
 									</a>
 								</li>
 								<li class="search-modules search-option">
-									<a href="#" data-value="7" data-placeholder="{l s='TODO'}" data-icon="icon-puzzle-piece">
+									<a href="#" data-value="7" data-placeholder="{l s='Module name'}" data-icon="icon-puzzle-piece">
 										<i class="icon-puzzle-piece"></i> {l s='Modules'}
 									</a>
 								</li>