diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index 756d2b1bc..499e11e20 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -750,4 +750,6 @@ h2:lang(en) { text-transform:capitalize; }
 
 #helpContent P {text-align:left; margin-left:10px;}
 #helpContent LI, #ftpPage LI {margin-top:10px;}
-#helpContent P.nextStepLink {text-align:center; font-weight:bold; margin-bottom:20px;}
\ No newline at end of file
+#helpContent P.nextStepLink {text-align:center; font-weight:bold; margin-bottom:20px;}
+
+#configContent FIELDSET {border:none;}
\ No newline at end of file
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 52984d0f1..dca3cda6c 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -13,7 +13,7 @@ jQuery().ready(function(){ldelim}
 </script>
 
 <div id="menubar">
-  <div id="adminHome"><a href="{$U_ADMIN}">Administration Home</a></div>
+  <div id="adminHome"><a href="{$U_ADMIN}">{'Administration Home'|@translate}</a></div>
   <dl class="first">
     <dt class="rdion"><span>{'Photos'|@translate}&nbsp;</span></dt>
     <dd>
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 065a2ad76..9d7e3008d 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -8,7 +8,7 @@
 {if !isset($default)}
 <form method="post" action="{$F_ACTION}" class="properties">
 {/if}
-
+<div id="configContent">
 {if isset($main)}
 <fieldset id="mainConf">
   <legend></legend>
@@ -196,6 +196,8 @@
 </fieldset>
 {/if}
 
+</div> <!-- configContent -->
+
 {if isset($default)}
 {$PROFILE_CONTENT}
 {/if}
diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl
index 763942e60..18e68686b 100644
--- a/admin/themes/default/template/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
@@ -22,11 +22,11 @@
   *}
 
   {'Powered by'|@translate}
-  <a href="{$PHPWG_URL}" title="Visit Piwigo project website">
+  <a href="{$PHPWG_URL}" title="{'Visit Piwigo project website'|@translate}">
   <span class="Piwigo">Piwigo</span></a>
   {$VERSION}
-  | <a class="external" href="{$pwgmenu.WIKI}" title="Read Piwigo Documentation" onclick="window.open(this.href, ''); return false;">{'Documentation'|@translate}</a>
-  | <a class="external" href="{$pwgmenu.FORUM}" title="Get Support on Piwigo Forum" onclick="window.open(this.href, ''); return false;">{'Support'|@translate}</a>
+  | <a class="external" href="{$pwgmenu.WIKI}" title="{'Read Piwigo Documentation'|@translate}" onclick="window.open(this.href, ''); return false;">{'Documentation'|@translate}</a>
+  | <a class="external" href="{$pwgmenu.FORUM}" title="{'Get Support on Piwigo Forum'|@translate}" onclick="window.open(this.href, ''); return false;">{'Support'|@translate}</a>
   </div> <!-- piwigoInfos -->
 
   <div id="pageInfos">
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
index 4068bfe74..61eb3602b 100644
--- a/admin/themes/default/template/header.tpl
+++ b/admin/themes/default/template/header.tpl
@@ -39,17 +39,17 @@
 
 <div id="pwgHead">
   <h1>
-    <a href="{$U_RETURN}" title="Visit Gallery">
+    <a href="{$U_RETURN}" title="{'Visit Gallery'|@translate}">
       <img src="{$ROOT_URL}admin/themes/{$theme.id}/icon/home.png" alt="{'Home'|@translate}">
       {$GALLERY_TITLE}
     </a>
   </h1>
 
   <div id="headActions">
-    Hello {$USERNAME} :
-    <a href="{$U_RETURN}">Visit Gallery</a> |
-    <a href="{$U_CHANGE_THEME}" title="Switch to clear or dark colors for administration">Change Admin Colors</a> |
-    <a href="{$U_FAQ}" title="{'Instructions to use Piwigo'|@translate}">Help Me</a> |
+    {'Hello'|@translate} {$USERNAME} :
+    <a href="{$U_RETURN}">{'Visit Gallery'|@translate}</a> |
+    <a href="{$U_CHANGE_THEME}" title="{'Switch to clear or dark colors for administration'|@translate}">{'Change Admin Colors'|@translate}</a> |
+    <a href="{$U_FAQ}" title="{'Instructions to use Piwigo'|@translate}">{'Help Me'|@translate}</a> |
     <a href="{$U_LOGOUT}">{'Logout'|@translate}</a>
   </div>
 </div>
diff --git a/admin/themes/default/template/photos_add_ploader.tpl b/admin/themes/default/template/photos_add_ploader.tpl
index bbff9804e..266285dc7 100644
--- a/admin/themes/default/template/photos_add_ploader.tpl
+++ b/admin/themes/default/template/photos_add_ploader.tpl
@@ -52,11 +52,11 @@ $().ready(function(){
 </div>
 
 <div id="pLoaderPage">
-<p>pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.</p>
+<p>{'pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'|@translate}</p>
 
 <ol>
   <li>
-    Download,
+    {'Download,'|@translate}
 
 <table class="downloads">
   <tr>
@@ -82,7 +82,7 @@ $().ready(function(){
 </table>
 
   </li>
-  <li>Install on your computer,</li>
-  <li>Start pLoader and add your photos.</li>
+  <li>{'Install on your computer,'|@translate}</li>
+  <li>{'Start pLoader and add your photos.'|@translate}</li>
 </ol>
 </div>
\ No newline at end of file
diff --git a/admin/themes/default/template/photos_add_settings.tpl b/admin/themes/default/template/photos_add_settings.tpl
index 856585404..d3bf2ecc6 100644
--- a/admin/themes/default/template/photos_add_settings.tpl
+++ b/admin/themes/default/template/photos_add_settings.tpl
@@ -19,7 +19,7 @@ $(document).ready(function(){
 </script>
 {/literal}
 
-<div class="titrePage" style="height:25px">
+<div class="titrePage">
   <h2>{'Upload Photos'|@translate}</h2>
 </div>
 
diff --git a/admin/themes/default/template/themes_installed.tpl b/admin/themes/default/template/themes_installed.tpl
index 4b050c51c..28d4df66a 100644
--- a/admin/themes/default/template/themes_installed.tpl
+++ b/admin/themes/default/template/themes_installed.tpl
@@ -5,12 +5,12 @@
 <div id="themesContent">
 
 <fieldset>
-<legend>Active Themes</legend>
+<legend>{'Active Themes'|@translate}</legend>
 {if isset($active_themes)}
 <div class="themeBoxes">
 {foreach from=$active_themes item=theme}
   <div class="themeBox{if $theme.is_default} themeDefault{/if}">
-    <div class="themeName">{$theme.name}{if $theme.is_default} <em>(default)</em>{/if}</div>
+    <div class="themeName">{$theme.name}{if $theme.is_default} <em>({'default'|@translate})</em>{/if}</div>
     <div class="themeShot"><img src="{$theme.screenshot}"></div>
     <div class="themeActions">
       <a href="{$deactivate_baseurl}{$theme.id}" title="{'Forbid this theme to users'|@translate}">{'Deactivate'|@translate}</a>
@@ -26,7 +26,7 @@
 
 {if isset($inactive_themes)}
 <fieldset>
-<legend>Inactive Themes</legend>
+<legend>{'Inactive Themes'|@translate}</legend>
 <div class="themeBoxes">
 {foreach from=$inactive_themes item=theme}
   <div class="themeBox">