diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 45c80fda1..2979007c9 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -15,9 +15,10 @@ table#agendatime {
     float: right;
     width: auto;
     margin-bottom: 1em;
+    font-size: 12px;
 }
 
 table#agendatime td {
-    padding: 5px;
+    padding: 3px;
     white-space: nowrap;
 }
diff --git a/openslides/agenda/templates/agenda/config.html b/openslides/agenda/templates/agenda/config.html
index a749108b2..d0e895c51 100644
--- a/openslides/agenda/templates/agenda/config.html
+++ b/openslides/agenda/templates/agenda/config.html
@@ -8,6 +8,9 @@
 {% block header %}
     <link rel="stylesheet" media="all" type="text/css" href="http://code.jquery.com/ui/1.10.0/themes/smoothness/jquery-ui.css" />
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/timepicker.css' %}" />
+{% endblock %}
+
+{% block javascript %}
     <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-1.10.0.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-timepicker-addon.js' %}"></script>
     <script type="text/javascript" src="{% static 'javascript/ui/jquery-ui-sliderAccess.js' %}"></script>
@@ -63,22 +66,20 @@
 {% block title %}{{ block.super }} – {% trans "Agenda settings" %}{% endblock %}
 
 
-
 {% block content %}
-    <h1>{% trans "Configuration" %}: {% trans "Agenda" %}
+    <h1>
+        {% trans "Configuration" %}
+        <small>{% trans "Agenda" %}</small>
         {% block config_submenu %}{{ block.super }}{% endblock %}
     </h1>
     <form action="" method="post">{% csrf_token %}
-    {{ form.as_p }}
-    <p>
-    <button class="button" type="submit">
-        <span class="icon ok">{% trans 'Save' %}</span>
-    </button>
-    <a href="{% url 'config_agenda' %}">
-    <button class="button" type="button" onclick="window.location='{% url 'config_agenda' %}'">
-        <span class="icon cancel">{% trans 'Cancel' %}</span>
-    </button>
-    </a>
-    </p>
+        {% include "form.html" %}
+        <p>
+        {% include "formbuttons_save.html" %}
+        <a href="{% url 'config_agenda' %}" class="btn">
+            {% trans 'Cancel' %}
+        </a>
+        </p>
+        <small>* {% trans "required" %}</small>
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index 723cd6915..af495ce33 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -29,9 +29,9 @@
     </td>
     {% endif %}
     {% if perms.agenda.can_see_orga_items %}
-    <td {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"DATETIME_FORMAT" }}"{% endif %}>
+    <td>
         {% if item.duration %}
-            {{ item.duration }}h
+            {{ item.duration }}h <i class="icon-clock" {% if item.tooltip %}title="{% trans 'End' %}: {{ item.tooltip|date:"DATETIME_FORMAT" }}"{% endif %}></i>
         {% endif %}
     </td>
     {% endif %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 4f714cb72..f6fc0916e 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -53,9 +53,17 @@
        {% endif %}
 
         <h1>{% trans "Agenda" %}
+            <small class="pull-right">
+            {% if perms.agenda.can_manage_agenda %}
+            <a href="{% url 'item_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
+            {% endif %}
+            <a href="{% url 'print_agenda' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
+            </small>
+        </h1>
+        
         {% if perms.agenda.can_see_orga_items %}
         {% if start and end %}
-        <table id="agendatime">
+        <table id="agendatime" class="table table-bordered">
            <tr>
                <td>{% trans "Start of event" %}:</td>
                <td>{{ start|date:"DATETIME_FORMAT" }}</td>
@@ -67,14 +75,6 @@
         </table>
         {% endif %}
         {% endif %}
-	    <small class="pull-right">
-            {% if perms.agenda.can_manage_agenda %}
-            <a href="{% url 'item_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New item' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
-            {% endif %}
-            <a href="{% url 'print_agenda' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print agenda as PDF' %}"><i class="icon-print"></i> PDF</a>
-            </small>
-        </h1>
-
         <label class="checkbox">
             <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
         </label>
diff --git a/openslides/static/img/glyphicons_054_clock.png b/openslides/static/img/glyphicons_054_clock.png
new file mode 100644
index 000000000..984bcc2cb
Binary files /dev/null and b/openslides/static/img/glyphicons_054_clock.png differ
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 4ab1f07a4..7075a4103 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -311,7 +311,10 @@ legend + .control-group {
     background-image: url("../img/glyphicons_006_user_add.png");
     background-position: 0;
 }
-
+.icon-clock {
+    background-image: url("../img/glyphicons_054_clock.png");
+    background-position: 0;
+}
 
 
 /** Responsive **/