--- a/src/cm/templates/site/layout/base_text.html	Thu Oct 03 10:19:03 2013 +0200
+++ b/src/cm/templates/site/layout/base_text.html	Thu Oct 03 10:29:53 2013 +0200
@@ -20,7 +20,10 @@
 {% block content %}
 
 {%  include "site/macros/text_actions.html" %}
-<h1 class="main_title_text"><a class="title" href="{% url text-view text.key %}">{{ text.get_title }}</a></h1>
+<h1 class="main_title_text">
+  {% if CONF.f_get_logo_url %}<div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" alt="logo" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" alt="logo" /></a></div>{% endif %}
+  <a class="title" href="{% url text-view text.key %}">{{ text.get_title }}</a>
+</h1>
 
 {% include "site/macros/text_meta.html" %}   
 {% include "site/macros/text_tabs.html" %}   

--- a/src/cm/templates/site/layout/base_workspace.html	Thu Oct 03 10:19:03 2013 +0200
+++ b/src/cm/templates/site/layout/base_workspace.html	Thu Oct 03 10:29:53 2013 +0200
@@ -13,7 +13,7 @@
 {% nb_users as nb_users %}
 <h1 class="main_title">
 {% if CONF.f_get_logo_url %}
-<div><img src="{{ CONF.f_get_logo_url }}"></img></div>
+<div><a title="{% blocktrans %}back to workspace{% endblocktrans %}" class="title" href="{% url index %}"><img src="{{ CONF.f_get_logo_url }}" alt="logo" /></a></div>
 {% endif %}
 
 {% if CONF.workspace_name %}