diff --git a/dav_events/templates/dav_events/auth/login_form.html b/dav_events/templates/dav_events/auth/login_form.html
index dad380b..def50af 100644
--- a/dav_events/templates/dav_events/auth/login_form.html
+++ b/dav_events/templates/dav_events/auth/login_form.html
@@ -6,18 +6,24 @@
 
 {% block page-container %}
 <div class="row">
-    <div class="col-sm-3">
+    <div class="col-sm-2">
         &nbsp;
     </div>
-    <div class="col-sm-6">
+    <div class="col-sm-8">
         <h3>{% trans 'Login' %}</h3>
         <div class="well">
             <form action="" method="post">
                 {% csrf_token %}
                 {% bootstrap_form form %}
                 {% buttons %}
-                <button type="submit" class="btn btn-success">{% trans 'Login' %}</button>
-                <a class="btn btn-danger" href="{% url 'dav_events:home' %}">{% trans 'Abbrechen' %}</a>
+                <button type="submit" class="btn btn-success">
+                    <span class="glyphicon glyphicon-log-in"></span>&thinsp;
+                    {% trans 'Login' %}
+                </button>
+                <a class="btn btn-danger" href="{% url 'dav_events:home' %}">
+                    <span class="glyphicon glyphicon-remove"></span>&thinsp;
+                    {% trans 'Abbrechen' %}
+                </a>
                 {% endbuttons %}
             </form>
         </div>
diff --git a/dav_events/templates/dav_events/auth/set_password_form.html b/dav_events/templates/dav_events/auth/set_password_form.html
index 9229d8b..d22826b 100644
--- a/dav_events/templates/dav_events/auth/set_password_form.html
+++ b/dav_events/templates/dav_events/auth/set_password_form.html
@@ -6,18 +6,24 @@
 
 {% block page-container %}
 <div class="row">
-    <div class="col-sm-3">
+    <div class="col-sm-2">
         &nbsp;
     </div>
-    <div class="col-sm-6">
+    <div class="col-sm-8">
         <h3>{% trans 'Neues Passwort setzen' %}</h3>
         <div class="well">
             <form action="" method="post">
                 {% csrf_token %}
                 {% bootstrap_form form %}
                 {% buttons %}
-                <button type="submit" class="btn btn-success">{% trans 'Neues Passwort setzen' %}</button>
-                <a class="btn btn-danger" href="{% url 'dav_events:home' %}">{% trans 'Abbrechen' %}</a>
+                <button type="submit" class="btn btn-success">
+                    <span class="glyphicon glyphicon-saved"></span>&thinsp;
+                    {% trans 'Neues Passwort setzen' %}
+                </button>
+                <a class="btn btn-danger" href="{% url 'dav_events:home' %}">
+                    <span class="glyphicon glyphicon-remove"></span>&thinsp;
+                    {% trans 'Abbrechen' %}
+                </a>
                 {% endbuttons %}
             </form>
         </div>
diff --git a/dav_events/templates/dav_events/event_create/SummaryForm.html b/dav_events/templates/dav_events/event_create/SummaryForm.html
index 9cc0501..8aa06c0 100644
--- a/dav_events/templates/dav_events/event_create/SummaryForm.html
+++ b/dav_events/templates/dav_events/event_create/SummaryForm.html
@@ -7,8 +7,14 @@
 {% endblock form-fields-visible %}
 {% block form-buttons %}
 {% buttons %}
-<button type="submit" class="btn btn-success">{% trans 'Einsenden' %}</button>
-<a class="btn btn-warning" href="?back">{% trans 'Zurück' %}</a>
-<a class="btn btn-danger" href="?abort">{% trans 'Abbrechen' %}</a>
+<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span>&thinsp;
+    {% trans 'Einsenden' %}
+</button>
+<a class="btn btn-warning" href="?back"><span class="glyphicon glyphicon-repeat"></span>&thinsp;
+    {% trans 'Zurück' %}
+</a>
+<a class="btn btn-danger" href="?abort"><span class="glyphicon glyphicon-remove"></span>&thinsp;
+    {% trans 'Abbrechen' %}
+</a>
 {% endbuttons %}
 {% endblock form-buttons %}
diff --git a/dav_events/templates/dav_events/event_create/base.html b/dav_events/templates/dav_events/event_create/base.html
index cf5007b..31c8a27 100644
--- a/dav_events/templates/dav_events/event_create/base.html
+++ b/dav_events/templates/dav_events/event_create/base.html
@@ -27,9 +27,15 @@
     {% endblock form-fields %}
     {% block form-buttons %}
     {% buttons %}
-    <button type="submit" class="btn btn-success">{% trans 'Weiter' %}</button>
-    <a class="btn btn-warning" href="?back">{% trans 'Zurück' %}</a>
-    <a class="btn btn-danger" href="?abort">{% trans 'Abbrechen' %}</a>
+    <button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span>&thinsp;
+        {% trans 'Weiter' %}
+    </button>
+    <a class="btn btn-warning" href="?back"><span class="glyphicon glyphicon-repeat"></span>&thinsp;
+        {% trans 'Zurück' %}
+    </a>
+    <a class="btn btn-danger" href="?abort"><span class="glyphicon glyphicon-remove"></span>&thinsp;
+        {% trans 'Abbrechen' %}
+    </a>
     {% endbuttons %}
     {% endblock form-buttons %}
     {% endblock form-content %}
diff --git a/dav_events/templates/dav_events/event_detail.html b/dav_events/templates/dav_events/event_detail.html
index e5d85e6..d77dcfd 100644
--- a/dav_events/templates/dav_events/event_detail.html
+++ b/dav_events/templates/dav_events/event_detail.html
@@ -17,8 +17,14 @@
                 </p>
             </div>
             <div class="modal-footer">
-                <a class="btn btn-success" href="{% url 'dav_events:event_accept' event.pk %}">{% trans 'Ja, mach schon!' %}</a>
-                <button type="button" class="btn btn-danger" data-dismiss="modal">{% trans 'Abbrechen' %}</button>
+                <a class="btn btn-success" href="{% url 'dav_events:event_accept' event.pk %}">
+                    <span class="glyphicon glyphicon-ok"></span>&thinsp;
+                    {% trans 'Ja, mach schon!' %}
+                </a>
+                <button type="button" class="btn btn-danger" data-dismiss="modal">
+                    <span class="glyphicon glyphicon-remove"></span>&thinsp;
+                    {% trans 'Abbrechen' %}
+                </button>
             </div>
         </div>
     </div>
@@ -29,12 +35,16 @@
 <div class="action-tabs">
     <div class="pull-right">
         <a class="btn {% if has_permission_accept %}btn-success{% else %}btn-default disabled{% endif %}"
-           data-toggle="modal" data-target="#modal-accept-dialog">{% trans 'Freigeben' %}</a>
-        <!--
+           data-toggle="modal" data-target="#modal-accept-dialog">
+            <span class="glyphicon glyphicon-check"></span>&thinsp;
+            {% trans 'Freigeben' %}
+        </a>
         <a class="btn btn-warning"
            href="{% url 'dav_events:event_detail' event.pk %}"
-           title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a>
-        -->
+           title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">
+            <span class="glyphicon glyphicon-duplicate"></span>&thinsp;
+            {% trans 'Kopieren' %}
+        </a>
     </div>
     <ul class="nav nav-tabs" role="tablist">
         <li>
diff --git a/dav_events/templates/dav_events/event_list.html b/dav_events/templates/dav_events/event_list.html
index 7c43592..7a1d0c1 100644
--- a/dav_events/templates/dav_events/event_list.html
+++ b/dav_events/templates/dav_events/event_list.html
@@ -5,7 +5,10 @@
 <div class="action-tabs">
     <div class="pull-right">
         <a class="btn btn-primary"
-           href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung anlegen' %}</a>
+           href="{% url 'dav_events:event_create' %}">
+            <span class="glyphicon glyphicon-plus"></span>
+            {% trans 'Neue Veranstaltung anlegen' %}
+        </a>
     </div>
     <ul class="nav nav-tabs" role="tablist">
         <li class="active">
diff --git a/dav_events/templates/dav_events/event_list_export_form.html b/dav_events/templates/dav_events/event_list_export_form.html
index 2729727..fc3bd49 100644
--- a/dav_events/templates/dav_events/event_list_export_form.html
+++ b/dav_events/templates/dav_events/event_list_export_form.html
@@ -6,7 +6,10 @@
 <div class="action-tabs">
     <div class="pull-right">
         <a class="btn btn-primary"
-           href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung anlegen' %}</a>
+           href="{% url 'dav_events:event_create' %}">
+            <span class="glyphicon glyphicon-plus"></span>
+            {% trans 'Neue Veranstaltung anlegen' %}
+        </a>
     </div>
     <ul class="nav nav-tabs" role="tablist">
         <li>
@@ -20,9 +23,16 @@
 <form action="" method="post">
     {% csrf_token %}
     {% bootstrap_form form %}
+    <div class="row">&nbsp;</div>
     {% buttons %}
-    <button type="submit" class="btn btn-success">{% trans 'Exportieren' %}</button>
-    <a class="btn btn-danger" href="{% url 'dav_events:event_list' %}">{% trans 'Abbrechen' %}</a>
+    <button type="submit" class="btn btn-success">
+        <span class="glyphicon glyphicon-download-alt"></span>&thinsp;
+        {% trans 'Herunterladen' %}
+    </button>
+    <a class="btn btn-danger" href="{% url 'dav_events:event_list' %}">
+        <span class="glyphicon glyphicon-remove"></span>&thinsp;
+        {% trans 'Abbrechen' %}
+    </a>
     {% endbuttons %}
 </form>
 {% endblock page-container-fluid %}
diff --git a/dav_events/templates/dav_events/event_update_form.html b/dav_events/templates/dav_events/event_update_form.html
index 3fa18b1..a27f728 100644
--- a/dav_events/templates/dav_events/event_update_form.html
+++ b/dav_events/templates/dav_events/event_update_form.html
@@ -35,8 +35,14 @@
             {% bootstrap_form form layout='horizontal' %}
         </div>
         <div class="panel-footer">
-            <button type="submit" class="btn btn-success">{% trans 'Speichern' %}</button>
-            <a class="btn btn-danger" href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Abbrechen' %}</a>
+            <button type="submit" class="btn btn-success">
+                <span class="glyphicon glyphicon-hdd"></span>&thinsp;
+                {% trans 'Speichern' %}
+            </button>
+            <a class="btn btn-danger" href="{% url 'dav_events:event_detail' event.pk %}">
+                <span class="glyphicon glyphicon-remove"></span>&thinsp;
+                {% trans 'Abbrechen' %}
+            </a>
         </div>
     </div>
 </form>
diff --git a/dav_events/templates/dav_events/includes/login_widget.html b/dav_events/templates/dav_events/includes/login_widget.html
index 0d757db..b762555 100644
--- a/dav_events/templates/dav_events/includes/login_widget.html
+++ b/dav_events/templates/dav_events/includes/login_widget.html
@@ -11,5 +11,8 @@
     </ul>
 </div>
 {% else %}
-<a class="btn btn-default btn-sm" href="{% url 'dav_events:login' %}">{% trans 'Login' %}</a>
+<a class="btn btn-default btn-sm" href="{% url 'dav_events:login' %}">
+    <span class="glyphicon glyphicon-log-in"></span>&nbsp;
+    {% trans 'Login' %}
+</a>
 {% endif %}