diff --git a/navalplanner-webapp/src/main/resources/logos/logo.png b/navalplanner-webapp/src/main/resources/logos/logo.png
deleted file mode 100644
index 819092808..000000000
Binary files a/navalplanner-webapp/src/main/resources/logos/logo.png and /dev/null differ
diff --git a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
index 667afcb4d..5004d9e8f 100644
--- a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
+++ b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
@@ -25,6 +25,7 @@
         <intercept-url pattern="/planner/css/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
         <intercept-url pattern="/callback/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
         <intercept-url pattern="/zkau/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
+        <intercept-url pattern="/help/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
         <intercept-url pattern="/common/layout/login.zul" access="IS_AUTHENTICATED_ANONYMOUSLY" />
         <intercept-url pattern="/common/layout/timeout.zul" access="IS_AUTHENTICATED_ANONYMOUSLY" />
         <intercept-url pattern="/advance/**" access="ROLE_ADMINISTRATION" />
diff --git a/navalplanner-webapp/src/main/webapp/common/img/en/logo.png b/navalplanner-webapp/src/main/webapp/common/img/en/logo.png
new file mode 100644
index 000000000..dae3a590e
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/en/logo.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/en/logo_login.png b/navalplanner-webapp/src/main/webapp/common/img/en/logo_login.png
new file mode 100644
index 000000000..e64f02864
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/en/logo_login.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/es/logo.png b/navalplanner-webapp/src/main/webapp/common/img/es/logo.png
new file mode 100644
index 000000000..9ae0a58eb
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/es/logo.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/es/logo_login.png b/navalplanner-webapp/src/main/webapp/common/img/es/logo_login.png
new file mode 100644
index 000000000..39dbdbdcb
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/es/logo_login.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/gl/logo.png b/navalplanner-webapp/src/main/webapp/common/img/gl/logo.png
new file mode 100644
index 000000000..c3499e441
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/gl/logo.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/gl/logo_login.png b/navalplanner-webapp/src/main/webapp/common/img/gl/logo_login.png
new file mode 100644
index 000000000..a9f639129
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/gl/logo_login.png differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/logo.png b/navalplanner-webapp/src/main/webapp/common/img/logo.png
deleted file mode 100644
index 819092808..000000000
Binary files a/navalplanner-webapp/src/main/webapp/common/img/logo.png and /dev/null differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/logo_login.png b/navalplanner-webapp/src/main/webapp/common/img/logo_login.png
deleted file mode 100644
index 376781d42..000000000
Binary files a/navalplanner-webapp/src/main/webapp/common/img/logo_login.png and /dev/null differ
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/login.zul b/navalplanner-webapp/src/main/webapp/common/layout/login.zul
index f20fba8b7..efd310ddb 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/login.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/login.zul
@@ -29,6 +29,8 @@
 <zscript>
 <![CDATA[
     contextPath = Executions.getCurrent().getContextPath();
+    logoLoginLink = contextPath + "/common/img/" +
+        org.navalplanner.web.I18nHelper._("en") + "/logo_login.png";
 ]]>
 </zscript>
 
@@ -39,7 +41,7 @@
 </n:table>
 <n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
   <n:tr>
-    <n:td height="100" align="left" valign="middle"><n:img src="${contextPath}/common/img/logo_login.png" alt="NavalPlan" /></n:td>
+    <n:td height="100" align="left" valign="middle"><n:img src="${contextPath}/common/img/${i18n:_('en')}/logo_login.png" alt="NavalPlan" /></n:td>
   </n:tr>
 </n:table>
 <n:table width="750" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
@@ -48,7 +50,7 @@
     <n:td class="identificacion">${i18n:_('Access to the system')}</n:td>
     <n:td align="right" valign="bottom">
         <div tooltiptext="${i18n:_('Help on authentication (opens a new window)')}">
-            <n:a href="http://www.navalplan.org/fileadmin/templates/doc/index.html" target="_blank" class="ayuda">${i18n:_('Help')}</n:a>
+            <n:a href="${contextPath}/help/${i18n:_('en')}/index.html" target="_blank" class="ayuda">${i18n:_('Help')}</n:a>
         </div>
     </n:td>
   </n:tr>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 1314fdbff..0fe0056ff 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -47,7 +47,7 @@
   <n:tr>
     <n:td width="180" valign="center">
         <n:a href="${contextPath}/">
-        <n:img src="${contextPath}/common/img/logo.png" /></n:a></n:td>
+        <n:img src="${contextPath}/common/img/${i18n:_('en')}/logo.png" /></n:a></n:td>
   <n:td valign="top">
   <n:table width="100%"  border="0" cellspacing="0" cellpadding="0">
     <n:tr>