diff --git a/openslides/agenda/static/images/icons/summary.png b/openslides/agenda/static/images/icons/summary.png
deleted file mode 100644
index 0f8264c78..000000000
Binary files a/openslides/agenda/static/images/icons/summary.png and /dev/null differ
diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 3851b9db8..27cb3d47c 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -5,20 +5,6 @@
  * :license: GNU GPL, see LICENSE for more details.
  */
 
-/* agenda item open/closed */
-.close_link span {
-    background-image: url(../images/icons/close-grey.png);
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-
-.close_link.closed span {
-    background-image: url(../images/icons/close.png);
-}
-
 tr.topline td {
     border-bottom: 1px solid #333333;
     background-color: #CDCDCD;
diff --git a/openslides/assignment/static/javascript/assignment.js b/openslides/assignment/static/javascript/assignment.js
index 9198434a0..1f3efd113 100644
--- a/openslides/assignment/static/javascript/assignment.js
+++ b/openslides/assignment/static/javascript/assignment.js
@@ -24,9 +24,6 @@ $(function() {
                     line.parent().parent().children('td').addClass('elected')
                 }
                 line.attr('href', data.link);
-            },
-            error: function () {
-                alert("Ajax Error");
             }
         });
     });
@@ -48,22 +45,24 @@ $(function() {
             }
         });
     });
+    // change publish status of ballot
     $('.publish_link').click(function(event) {
         event.preventDefault();
-        link = $(this);
+        var link = $(this);
         $.ajax({
             type: 'GET',
-            url: link.attr('href'),
+            url: $(this).attr('href'),
             dataType: 'json',
             success: function(data) {
                 if (data.published) {
-                    link.addClass('published');
-                    //link.attr('title', gettext('Unpublish ballot'))
+                    newclass = 'icon-checked-new_white';
+                    link.addClass('btn-primary');
                 } else {
-                    link.removeClass('published');
-                    //link.attr('title', 'Publish ballot')
+                    newclass = 'icon-unchecked-new';
+                    link.removeClass('btn-primary');
                 }
+                link.children('i').removeClass('icon-checked-new_white icon-unchecked-new').addClass(newclass);
+                link.attr('href', data.link);
             }
         });
-    });
-});
+    });});
diff --git a/openslides/assignment/static/styles/assignment.css b/openslides/assignment/static/styles/assignment.css
index 4079471c7..4a84a9189 100644
--- a/openslides/assignment/static/styles/assignment.css
+++ b/openslides/assignment/static/styles/assignment.css
@@ -10,7 +10,7 @@ td.elected {
 }
 
 td.elected a.election_link {
-    background-image: url(../images/icons/voting-yes.png);
+    background-image: url(../img/voting-yes.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;
@@ -21,7 +21,7 @@ td.elected a.election_link {
 }
 
 td a.election_link {
-    background-image: url(../images/icons/voting-yes-grey.png);
+    background-image: url(../img/voting-yes-grey.png);
     background-repeat: no-repeat;
     background-position: center;
     width: 16px;
@@ -30,15 +30,3 @@ td a.election_link {
     margin-right: 5px;
     float: left;
 }
-
-a.publish_link span {
-    background-image: url(../images/icons/off.png);
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-a.publish_link.published span {
-    background-image: url(../images/icons/on.png);
-}
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index cab84e86c..743117126 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -77,7 +77,9 @@
                 | <b>{% trans "elected" %}</b>
                 {% if perms.assignment.can_manage_assignment %}
                     {% if assignment.status == "sea" or assignment.status == "vot" %}
-                        <a href="{% url 'assignment_user_not_elected' assignment.id person.person_id %}"><img src="{% static 'images/icons/dialog-cancel.png' %}" title="{% trans 'Mark candidate as not elected' %}"></a>
+                        <a class="btn btn-mini" href="{% url 'assignment_user_not_elected' assignment.id person.person_id %}" rel="tooltip" data-original-title="{% trans 'Mark candidate as not elected' %}">
+                            <i class="icon-ban-circle"></i>
+                        </a>
                     {% endif %}
                 {% endif %}
             {% endif %}
@@ -107,9 +109,9 @@
                 <label>{{ field.label }}:</label>
                 <div class="input-append">
                     {{ field }}
-                    <button class="btn btn-primary" type="submit">{% trans 'Apply' %}</button>
+                    <button class="btn btn-primary" type="submit" title="{% trans 'Apply' %}"><i class="icon-ok icon-white"></i></button>
                     {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
-                        <a href="{% url 'user_new' %}" target="_blank" class="btn"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
+                        <a href="{% url 'user_new' %}" target="_blank" class="btn"  title="{% trans 'Add new participant' %}"><i class="icon-add-user"></i></a>
                     {% endif %}
                 </div>
             {% endfor %}
@@ -126,7 +128,10 @@
     <ul>
     {% for person in blocked_candidates %}
         <li>
-            {{ person }}<a href="{% url 'assignment_delother' assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
+            {{ person }}
+            <a class="btn btn-mini" href="{% url 'assignment_delother' assignment.id person.person_id %}" title="{% trans 'Remove candidate' %}">
+                <i class="icon-ban-circle"></i>
+            </a>
         </li>
     {% empty %}
         <li>{% trans "No blocked candidates available." %}</li>
@@ -155,10 +160,14 @@
                     {{ poll.get_ballot }}. {% trans 'ballot' %}
                     {% if perms.assignment.can_manage_assignment %}
                         <br>
-                        <a class="publish_link {% if poll.published %}published{% endif %}"
+                        <a class="publish_link btn btn-mini {% if poll.published %}btn-primary{% endif %}"
                         href="{% url 'assignment_poll_publish_status' poll.id %}"
-                        title="{% trans 'Publish/unpublish results' %}">
-                        <span></span>
+                        rel="tooltip" data-original-title="{% trans 'Publish/unpublish results' %}">
+                        {% if poll.published %}
+                            <i class="icon-checked-new_white"></i>
+                            {% else %}
+                            <i class="icon-unchecked-new"></i>
+                            {% endif %}
                         </a>
                         <a href="{% url 'assignment_poll_view' poll.id %}" class="btn btn-mini" title="{% trans 'Edit' %}"><i class="icon-pencil"></i></a>
                         <a href="{% url 'assignment_poll_delete' poll.id %}" class="btn btn-mini" title="{% trans 'Delete' %}"><i class="icon-remove"></i></a>
@@ -178,10 +187,10 @@
             <td>
                 {% if candidate in assignment.elected %}
                     {% if perms.assignment.can_manage_assignment %}
-                        <a class="election_link elected" href="{% url 'assignment_user_not_elected assignment.id' candidate.person_id %}"></a>
+                        <a class="election_link elected" href="{% url 'assignment_user_not_elected' assignment.id candidate.person_id %}"></a>
                     {% else %}
                         <a class="elected">
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
                         </a>
                     {% endif %}
                 {% else %}
@@ -194,11 +203,11 @@
             {% for vote in poll_list %}
                 <td style="white-space:nowrap;">
                     {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
-                        <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
-                        <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
+                        <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
+                        <img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
+                        <img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
                     {% elif 'Votes' in vote %}
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
+                        <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
                     {% elif vote == None %}
                         {% trans 'was not a <br> candidate'%}
                     {% else %}
@@ -217,7 +226,7 @@
                 {% if poll.published or perms.assignment.can_manage_assignment %}
                     <td style="white-space:nowrap;">
                         {% if poll.has_votes %}
-                            <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
+                            <img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
                             {{ poll.print_votesinvalid }}
                         {% endif %}
                     </td>
@@ -233,7 +242,7 @@
                 {% if poll.published or perms.assignment.can_manage_assignment %}
                     <td style="white-space:nowrap;">
                         {% if poll.has_votes %}
-                            <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}">
+                            <img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}">
                             <strong>{{ poll.print_votescast }}</strong>
                         {% endif %}
                     </td>
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index 35c10f64b..761e70bf1 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -66,7 +66,7 @@
                 <td class="candidate{% if candidate in assignment.elected %} elected{% endif %}">
                     {% if candidate in assignment.elected %}
                         <a class="elected">
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
                         </a>
                     {% endif %}
                     {{ candidate }}
@@ -75,11 +75,11 @@
                 <td style="white-space:nowrap;"{% if candidate in assignment.elected %} class="elected"{% endif %}>
                     {% if not assignment_publish_winner_results_only or candidate in assignment.elected %}
                         {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
-                            <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
-                            <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
+                            <img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
+                            <img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
                         {% elif 'Votes' in vote %}
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
                         {% elif vote == None %}
                             {% trans 'was not a <br> candidate'%}
                         {% else %}
@@ -97,7 +97,7 @@
             {% for poll in polls %}
                 <td style="white-space:nowrap;">
                     {% if  poll.has_votes %}
-                        <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
+                        <img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
                         {{ poll.print_votesinvalid }}
                     {% endif %}
                 </td>
@@ -112,7 +112,7 @@
 
                 <td style="white-space:nowrap;">
                     {% if poll.has_votes %}
-                        <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}">
+                        <img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}">
                         <strong>{{ poll.print_votescast }}</strong>
                     {% endif %}
                 </td>
diff --git a/openslides/motion/templates/motion/base_motion.html b/openslides/motion/templates/motion/base_motion.html
deleted file mode 100644
index 0dc5846a6..000000000
--- a/openslides/motion/templates/motion/base_motion.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% extends "base.html" %}
-
-{% load tags %}
-{% load i18n %}
-{% load staticfiles %}
-
-{% block submenu %}
-    {% url 'motion_overview' as url_motionoverview %}
-    <h4>{% trans "Motions" %}</h4>
-    <ul>
-        <li class="{% if request.path == url_motionoverview %}selected{% endif %}"><a href="{% url 'motion_overview' %}">{% trans "All motions" %}</a></li>
-        {% if perms.motion.can_create_motion or perms.motion.can_manage_motion %}
-            <li class="{% active request '/motion/new' %}"><a href="{% url 'motion_new' %}">{% trans "New motion" %}</a></li>
-        {% endif %}
-        {% if perms.motion.can_manage_motion %}
-            <li class="{% active request '/motion/import' %}"><a href="{% url 'motion_import' %}">{% trans 'Import motions' %}</a></li>
-        {% endif %}
-        <li><a href="{% url 'print_motions' %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All motions as PDF' %}</a></li>
-    </ul>
-
-    {# second submenu #}
-    {% if motion %}
-        <br>
-        <h3>{% trans "Motion No." %}
-            {% if motion.number != None %}
-                {{ motion.number }}
-            {% else %}
-                <i>[-]</i>
-            {% endif %}
-        </h3>
-        <ul>
-        {# view motion #}
-            {% url 'motion_view' motion.id as url_motionview %}
-            <li class="{% if request.path == url_motionview %}selected{% endif %}"><a href="{% url 'motion_view' motion.id  %}">{% trans 'View motion' %}</a></li>
-        {# edit motion #}
-            {% if "edit" in actions %}
-            {% url 'motion_edit' motion.id as url_motionedit %}
-            <li class="{% if request.path == url_motionedit %}selected{% endif %}"><a href="{% url 'motion_edit' motion.id  %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit motion' %}</a></li>
-            {% endif %}
-        {# delete motion #}
-            {% if "delete" in actions %}
-            <li><a href="{% url 'motion_delete' motion.id  %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete motion' %}</a></li>
-            {% endif %}
-        {# PDF #}
-            <li><a href="{% url 'print_motion' motion.id  %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Motion as PDF' %}</a></li>
-        {# activate and polls #}
-            {% if perms.projector.can_manage_projector %}
-                <li>
-                    <a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid  %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show Motion' %}</a>
-                </li>
-            {% endif %}
-            {% if perms.motion.can_manage_motion %}
-                {% for poll in motion.polls %}
-                    {% url 'motion_poll_view' poll.id as url_motionpollview %}
-                    <li class="{% if request.path == url_motionpollview %}selected{% endif %}"><a href="{% url 'motion_poll_view' poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
-                {% endfor %}
-            {% endif %}
-        {# Agenda Item #}
-            {% if perms.agenda.can_manage_agenda %}
-            <li>
-                <a href="{% url 'motion_create_agenda' motion.id  %}">{% trans 'New agenda item' %}</a>
-            </li>
-            {% endif %}
-        </ul>
-    {% endif %}
-{% endblock %}
diff --git a/openslides/motion/templates/motion/view.html b/openslides/motion/templates/motion/view.html
index de7d03936..b3e9256ab 100644
--- a/openslides/motion/templates/motion/view.html
+++ b/openslides/motion/templates/motion/view.html
@@ -43,7 +43,7 @@
             <ul class="dropdown-menu pull-right">
                 <!-- edit -->
                 {% if "edit" in actions %}
-                     <li><a href="{% url 'motion_edit' motion.id  %}"><i class="icon-edit"></i> {% trans 'Edit motion' %}</a></li>
+                     <li><a href="{% url 'motion_edit' motion.id  %}"><i class="icon-pencil"></i> {% trans 'Edit motion' %}</a></li>
                 {% endif %}
                 <!-- delete -->
                 {% if "delete" in actions %}
@@ -70,11 +70,11 @@
 <div class="row-fluid">
 <div class="span8">
     {% if motion.public_version != motion.last_version %}
-        &#8901;
+        <span class="label label-warning"><i class="icon-warning-sign icon-white"></i>
         {% if version == motion.public_version %}
-            {% trans "This is not the newest version." %} <a href="{% url 'motion_view_newest' motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
+            {% trans "This is not the newest version." %}</span> <a href="{% url 'motion_view_newest' motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
         {% else %}
-            {% trans "This is not the authorized version." %} <a href="{% url 'motion_view' motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
+            {% trans "This is not the authorized version." %}</span> <a href="{% url 'motion_view' motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
         {% endif %}
     {% endif %}
 
@@ -107,17 +107,17 @@
             <td style="white-space:nowrap;">
             {% if motion.status != "pub" %}
             {% if revision == motion.permitted %}
-                 <img title="{% trans 'Version authorized' %}" src="{% static 'images/icons/accept.png' %}">
+                 <span class="badge badge-success" title="{% trans 'This version is authorized' %}"><i class="icon-ok icon-white"></i></span>
             {% else %}
                  {% if perms.motion.can_manage_motion %}
-                     <a href="{% url 'motion_version_permit' revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
+                     <a class="btn btn-mini" href="{% url 'motion_version_permit' revision.id %}" title="{% trans 'Permit this version' %}"><i class="icon-ok"></i></a>
                  {% endif %}
                  {% if not revision.rejected and revision.id > motion.permitted.id and perms.motion.can_manage_motion %}
-                     <a href="{% url 'motion_version_reject' revision.id %}"><img title="{% trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
+                     <a class="btn btn-mini" href="{% url 'motion_version_reject' revision.id %}" title="{% trans 'Reject this version' %}"><i class="icon-ban-circle"></i></a>
                  {% endif %}
             {% endif %}
             {% if revision.rejected %}
-                <img title="{% trans 'Version rejected' %}" src="{% static 'images/icons/reject.png' %}">
+                <span class="badge badge-important" title="{% trans 'This version is rejected' %}"><i class="icon-ban-circle icon-white"></i></span>
             {% endif %}
             {% endif %}
             </td>
@@ -216,12 +216,12 @@
                     <br>
                     {% if poll.has_votes %}
                         {% with poll.get_options.0 as option %}
-                            <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
-                            <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
-                            <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
-                            <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
+                            <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
+                            <img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
+                            <img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
+                            <img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
                             <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
-                                <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
+                                <img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
                             </div>
                         {% endwith %}
                         {% if perms.motion.can_manage_motion %}
diff --git a/openslides/motion/templates/projector/Motion.html b/openslides/motion/templates/projector/Motion.html
index ab094313f..7ac6ae458 100644
--- a/openslides/motion/templates/projector/Motion.html
+++ b/openslides/motion/templates/projector/Motion.html
@@ -11,10 +11,10 @@
         <p><b>{% trans "Status" %}:</b><br>
         {% if motion.status != "pub" %}
             {% if motion.status == "acc" %}
-            <img src="{% static 'images/icons/voting-yes.png' %}">
+            <img src="{% static 'img/voting-yes.png' %}">
             {% endif %}
             {% if motion.status == "rej" %}
-            <img src="{% static 'images/icons/voting-no.png' %}">
+            <img src="{% static 'img/voting-no.png' %}">
             {% endif %}
             {% trans motion.get_status_display %}
         {% else %}
@@ -34,12 +34,12 @@
                 {% endif %}
                 {% with poll.get_options.0 as option %}
                 <div class="results">
-                    <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }} <br>
-                    <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }} <br>
-                    <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}">  {{ option.Abstain }}<br>
-                    <img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
+                    <img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }} <br>
+                    <img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }} <br>
+                    <img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}">  {{ option.Abstain }}<br>
+                    <img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
                     <hr>
-                    <img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
+                    <img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
                 </div>
                 {% endwith %}
             {% else %}
diff --git a/openslides/participant/static/styles/participant.css b/openslides/participant/static/styles/participant.css
index 0d656c9c8..20def00e1 100644
--- a/openslides/participant/static/styles/participant.css
+++ b/openslides/participant/static/styles/participant.css
@@ -4,19 +4,3 @@
  * :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
  * :license: GNU GPL, see LICENSE for more details.
  */
-
-a.status_link span {
-    background-repeat: no-repeat;
-    background-position: center;
-    width: 16px;
-    height: 16px;
-    display: inline-block;
-}
-
-a.status_link.deactivate span {
-    background-image: url(../images/icons/on.png);
-}
-
-a.status_link.activate span {
-    background-image: url(../images/icons/off.png);
-}
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index 3cdbfa171..256135dd6 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -17,20 +17,30 @@
     <table class="table table-striped table-bordered">
         <tr>
             <th>{% trans "Group" %}</th>
-            <th>{% trans "Actions" %}</th>
+            <th style="width: 1px;">{% trans "Actions" %}</th>
         </tr>
     {% for group in groups %}
-        <tr class="{% cycle '' 'odd' %}">
-            <td><a href="{% model_url group 'view' %}">{{ group.name }}</a></td>
-            <td><a href="{% url 'user_group_edit' group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit group' %}"></a>
-            {% if group.name|lower != 'anonymous' and group.name|lower != 'registered' %}
-            <a href="{% url 'user_group_delete' group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete group' %}"></a>
-            {% endif %}
+        <tr class="{% if group.active %}activeline{% endif %}">
+            <td>
+                <a href="{% model_url group 'view' %}">{{ group.name }}</a>
+            </td>
+            <td>
+                <span style="width: 1px; white-space: nowrap;">
+                    {% if perms.projector.can_manage_projector %}
+                       <a href="{% url 'projector_activate_slide' group.sid  %}" class="activate_link btn {% if group.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
+                           <i class="icon-facetime-video {% if group.active %}icon-white{% endif %}"></i>
+                       </a>
+                    {% endif %}
+                    <a href="{% url 'user_group_edit' group.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
+                        <i class="icon-pencil"></i>
+                    </a>
+                    {% if group.name|lower != 'anonymous' and group.name|lower != 'registered' %}
+                    <a href="{% url 'user_group_delete' group.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
+                        <i class="icon-remove"></i>
+                    </a>
+                    {% endif %}
+                </span>
             </td>
-        </tr>
-    {% empty %}
-        <tr>
-        <td colspan="5"><i>{% trans "No groups available." %}</i></td>
         </tr>
     {% endfor %}
     </table>
diff --git a/openslides/projector/static/images/icons/clock.png b/openslides/projector/static/images/icons/clock.png
deleted file mode 100644
index a7800ef21..000000000
Binary files a/openslides/projector/static/images/icons/clock.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/document-save.png b/openslides/projector/static/images/icons/document-save.png
deleted file mode 100644
index 8072aea32..000000000
Binary files a/openslides/projector/static/images/icons/document-save.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/go-down.png b/openslides/projector/static/images/icons/go-down.png
deleted file mode 100644
index 6a2bb793c..000000000
Binary files a/openslides/projector/static/images/icons/go-down.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/go-up.png b/openslides/projector/static/images/icons/go-up.png
deleted file mode 100644
index dca17c452..000000000
Binary files a/openslides/projector/static/images/icons/go-up.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/pause.png b/openslides/projector/static/images/icons/pause.png
deleted file mode 100644
index a9b3113fb..000000000
Binary files a/openslides/projector/static/images/icons/pause.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/play.png b/openslides/projector/static/images/icons/play.png
deleted file mode 100644
index 80ff3a1d5..000000000
Binary files a/openslides/projector/static/images/icons/play.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/skip-backward.png b/openslides/projector/static/images/icons/skip-backward.png
deleted file mode 100644
index 1de5dbacf..000000000
Binary files a/openslides/projector/static/images/icons/skip-backward.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/spin-down.png b/openslides/projector/static/images/icons/spin-down.png
deleted file mode 100644
index e54993882..000000000
Binary files a/openslides/projector/static/images/icons/spin-down.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/spin-up.png b/openslides/projector/static/images/icons/spin-up.png
deleted file mode 100644
index 7830c52a7..000000000
Binary files a/openslides/projector/static/images/icons/spin-up.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/view-reset.png b/openslides/projector/static/images/icons/view-reset.png
deleted file mode 100644
index 7726c3546..000000000
Binary files a/openslides/projector/static/images/icons/view-reset.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/zoom-in.png b/openslides/projector/static/images/icons/zoom-in.png
deleted file mode 100644
index e96beb2f7..000000000
Binary files a/openslides/projector/static/images/icons/zoom-in.png and /dev/null differ
diff --git a/openslides/projector/static/images/icons/zoom-out.png b/openslides/projector/static/images/icons/zoom-out.png
deleted file mode 100644
index 75a1837c4..000000000
Binary files a/openslides/projector/static/images/icons/zoom-out.png and /dev/null differ
diff --git a/openslides/projector/static/img/glyphicons_054_clock.png b/openslides/projector/static/img/glyphicons_054_clock.png
new file mode 100644
index 000000000..46a86c1a9
Binary files /dev/null and b/openslides/projector/static/img/glyphicons_054_clock.png differ
diff --git a/openslides/projector/static/images/logo-projector.png b/openslides/projector/static/img/logo-projector.png
similarity index 100%
rename from openslides/projector/static/images/logo-projector.png
rename to openslides/projector/static/img/logo-projector.png
diff --git a/openslides/projector/static/images/presentation-header-bg.png b/openslides/projector/static/img/presentation-header-bg.png
similarity index 100%
rename from openslides/projector/static/images/presentation-header-bg.png
rename to openslides/projector/static/img/presentation-header-bg.png
diff --git a/openslides/projector/static/styles/projector.css b/openslides/projector/static/styles/projector.css
index 423c8039d..2f22b4550 100644
--- a/openslides/projector/static/styles/projector.css
+++ b/openslides/projector/static/styles/projector.css
@@ -18,7 +18,7 @@ body{
 /*** HEADER ***/
 #header {
     position:relative;
-    background:url("../images/presentation-header-bg.png") repeat-x scroll center top #3D3020;
+    background:url("../img/presentation-header-bg.png") repeat-x scroll center top #3D3020;
     height:100px;
 }
 #logo {
@@ -58,7 +58,7 @@ body{
     top:110px;
     right:40px;
     padding-left:30px;
-    background: url(../images/icons/clock.png) no-repeat scroll 0px 4px;
+    background: url(../img/glyphicons_054_clock.png) no-repeat scroll 0px 4px;
 }
 
 #currentTime.ajax_error {
diff --git a/openslides/projector/templates/base-projector.html b/openslides/projector/templates/base-projector.html
index b291d2419..af2845b92 100644
--- a/openslides/projector/templates/base-projector.html
+++ b/openslides/projector/templates/base-projector.html
@@ -21,7 +21,7 @@
         <div id="ajaxswitcher"></div>
 
         <div id="header">
-            <div id="logo"><img src="{% static 'images/logo-projector.png' %}"></div>
+            <div id="logo"><img src="{% static 'img/logo-projector.png' %}"></div>
             <div class="event_name">{% get_config 'event_name' %}</div>
             <div class="event_description">{% get_config 'event_description' %}</div>
         </div>
diff --git a/openslides/static/images/icons/accept-grey.png b/openslides/static/images/icons/accept-grey.png
deleted file mode 100644
index d6c64cfab..000000000
Binary files a/openslides/static/images/icons/accept-grey.png and /dev/null differ
diff --git a/openslides/static/images/icons/accept.png b/openslides/static/images/icons/accept.png
deleted file mode 100644
index 225abbf4d..000000000
Binary files a/openslides/static/images/icons/accept.png and /dev/null differ
diff --git a/openslides/static/images/icons/add-user.png b/openslides/static/images/icons/add-user.png
deleted file mode 100644
index b413be26a..000000000
Binary files a/openslides/static/images/icons/add-user.png and /dev/null differ
diff --git a/openslides/static/images/icons/add.png b/openslides/static/images/icons/add.png
deleted file mode 100644
index 1e03be9bc..000000000
Binary files a/openslides/static/images/icons/add.png and /dev/null differ
diff --git a/openslides/static/images/icons/clear.png b/openslides/static/images/icons/clear.png
deleted file mode 100644
index 6c4b83b7a..000000000
Binary files a/openslides/static/images/icons/clear.png and /dev/null differ
diff --git a/openslides/static/images/icons/close-grey.png b/openslides/static/images/icons/close-grey.png
deleted file mode 100644
index b843656fc..000000000
Binary files a/openslides/static/images/icons/close-grey.png and /dev/null differ
diff --git a/openslides/static/images/icons/close.png b/openslides/static/images/icons/close.png
deleted file mode 100644
index 1c311e210..000000000
Binary files a/openslides/static/images/icons/close.png and /dev/null differ
diff --git a/openslides/static/images/icons/cross.png b/openslides/static/images/icons/cross.png
deleted file mode 100644
index 0cdfc1d42..000000000
Binary files a/openslides/static/images/icons/cross.png and /dev/null differ
diff --git a/openslides/static/images/icons/delete.png b/openslides/static/images/icons/delete.png
deleted file mode 100644
index 87cd0b012..000000000
Binary files a/openslides/static/images/icons/delete.png and /dev/null differ
diff --git a/openslides/static/images/icons/dialog-cancel.png b/openslides/static/images/icons/dialog-cancel.png
deleted file mode 100644
index 45f8949bf..000000000
Binary files a/openslides/static/images/icons/dialog-cancel.png and /dev/null differ
diff --git a/openslides/static/images/icons/dialog-ok-apply.png b/openslides/static/images/icons/dialog-ok-apply.png
deleted file mode 100644
index f1d290c64..000000000
Binary files a/openslides/static/images/icons/dialog-ok-apply.png and /dev/null differ
diff --git a/openslides/static/images/icons/dialog-ok.png b/openslides/static/images/icons/dialog-ok.png
deleted file mode 100644
index c173526fa..000000000
Binary files a/openslides/static/images/icons/dialog-ok.png and /dev/null differ
diff --git a/openslides/static/images/icons/done-grey.png b/openslides/static/images/icons/done-grey.png
deleted file mode 100644
index 4e5e16f47..000000000
Binary files a/openslides/static/images/icons/done-grey.png and /dev/null differ
diff --git a/openslides/static/images/icons/done.png b/openslides/static/images/icons/done.png
deleted file mode 100644
index 5ea69d2dd..000000000
Binary files a/openslides/static/images/icons/done.png and /dev/null differ
diff --git a/openslides/static/images/icons/edit.png b/openslides/static/images/icons/edit.png
deleted file mode 100644
index 84e345d22..000000000
Binary files a/openslides/static/images/icons/edit.png and /dev/null differ
diff --git a/openslides/static/images/icons/error.png b/openslides/static/images/icons/error.png
deleted file mode 100644
index 0281708ab..000000000
Binary files a/openslides/static/images/icons/error.png and /dev/null differ
diff --git a/openslides/static/images/icons/export.png b/openslides/static/images/icons/export.png
deleted file mode 100644
index ebcc0fa9a..000000000
Binary files a/openslides/static/images/icons/export.png and /dev/null differ
diff --git a/openslides/static/images/icons/guest.png b/openslides/static/images/icons/guest.png
deleted file mode 100644
index b50ec42a5..000000000
Binary files a/openslides/static/images/icons/guest.png and /dev/null differ
diff --git a/openslides/static/images/icons/import.png b/openslides/static/images/icons/import.png
deleted file mode 100644
index 66305f4ad..000000000
Binary files a/openslides/static/images/icons/import.png and /dev/null differ
diff --git a/openslides/static/images/icons/information.png b/openslides/static/images/icons/information.png
deleted file mode 100644
index cbabb0e54..000000000
Binary files a/openslides/static/images/icons/information.png and /dev/null differ
diff --git a/openslides/static/images/icons/number.png b/openslides/static/images/icons/number.png
deleted file mode 100644
index 87e23bb31..000000000
Binary files a/openslides/static/images/icons/number.png and /dev/null differ
diff --git a/openslides/static/images/icons/off.png b/openslides/static/images/icons/off.png
deleted file mode 100644
index fd50901be..000000000
Binary files a/openslides/static/images/icons/off.png and /dev/null differ
diff --git a/openslides/static/images/icons/on.png b/openslides/static/images/icons/on.png
deleted file mode 100644
index 1221e1310..000000000
Binary files a/openslides/static/images/icons/on.png and /dev/null differ
diff --git a/openslides/static/images/icons/pdf.png b/openslides/static/images/icons/pdf.png
deleted file mode 100644
index 9498f0ffd..000000000
Binary files a/openslides/static/images/icons/pdf.png and /dev/null differ
diff --git a/openslides/static/images/icons/preview.png b/openslides/static/images/icons/preview.png
deleted file mode 100644
index 3b674c3bd..000000000
Binary files a/openslides/static/images/icons/preview.png and /dev/null differ
diff --git a/openslides/static/images/icons/projector.png b/openslides/static/images/icons/projector.png
deleted file mode 100644
index cb2be2258..000000000
Binary files a/openslides/static/images/icons/projector.png and /dev/null differ
diff --git a/openslides/static/images/icons/reject-grey.png b/openslides/static/images/icons/reject-grey.png
deleted file mode 100644
index b34520453..000000000
Binary files a/openslides/static/images/icons/reject-grey.png and /dev/null differ
diff --git a/openslides/static/images/icons/reject.png b/openslides/static/images/icons/reject.png
deleted file mode 100644
index 9006b077d..000000000
Binary files a/openslides/static/images/icons/reject.png and /dev/null differ
diff --git a/openslides/static/images/icons/remove-user.png b/openslides/static/images/icons/remove-user.png
deleted file mode 100644
index 6ac1d6846..000000000
Binary files a/openslides/static/images/icons/remove-user.png and /dev/null differ
diff --git a/openslides/static/images/icons/remove.png b/openslides/static/images/icons/remove.png
deleted file mode 100644
index 5a4d15b7b..000000000
Binary files a/openslides/static/images/icons/remove.png and /dev/null differ
diff --git a/openslides/static/images/icons/revert.png b/openslides/static/images/icons/revert.png
deleted file mode 100644
index b224e05e8..000000000
Binary files a/openslides/static/images/icons/revert.png and /dev/null differ
diff --git a/openslides/static/images/icons/statistics.png b/openslides/static/images/icons/statistics.png
deleted file mode 100644
index 5a05fa48d..000000000
Binary files a/openslides/static/images/icons/statistics.png and /dev/null differ
diff --git a/openslides/static/images/icons/undo.png b/openslides/static/images/icons/undo.png
deleted file mode 100644
index 83e41dcf3..000000000
Binary files a/openslides/static/images/icons/undo.png and /dev/null differ
diff --git a/openslides/static/images/icons/user-information.png b/openslides/static/images/icons/user-information.png
deleted file mode 100644
index 346f21e7b..000000000
Binary files a/openslides/static/images/icons/user-information.png and /dev/null differ
diff --git a/openslides/static/images/icons/warning.png b/openslides/static/images/icons/warning.png
deleted file mode 100644
index 1abe3f3f9..000000000
Binary files a/openslides/static/images/icons/warning.png and /dev/null differ
diff --git a/openslides/static/img/glyphicons_006_user_add.png b/openslides/static/img/glyphicons_006_user_add.png
new file mode 100644
index 000000000..098d70d3d
Binary files /dev/null and b/openslides/static/img/glyphicons_006_user_add.png differ
diff --git a/openslides/static/images/icons/voting-abstention.png b/openslides/static/img/voting-abstention.png
similarity index 100%
rename from openslides/static/images/icons/voting-abstention.png
rename to openslides/static/img/voting-abstention.png
diff --git a/openslides/static/images/icons/voting-invalid.png b/openslides/static/img/voting-invalid.png
similarity index 100%
rename from openslides/static/images/icons/voting-invalid.png
rename to openslides/static/img/voting-invalid.png
diff --git a/openslides/static/images/icons/voting-no.png b/openslides/static/img/voting-no.png
similarity index 100%
rename from openslides/static/images/icons/voting-no.png
rename to openslides/static/img/voting-no.png
diff --git a/openslides/static/images/icons/voting-total.png b/openslides/static/img/voting-total.png
similarity index 100%
rename from openslides/static/images/icons/voting-total.png
rename to openslides/static/img/voting-total.png
diff --git a/openslides/static/images/icons/voting-yes-grey.png b/openslides/static/img/voting-yes-grey.png
similarity index 100%
rename from openslides/static/images/icons/voting-yes-grey.png
rename to openslides/static/img/voting-yes-grey.png
diff --git a/openslides/static/images/icons/voting-yes.png b/openslides/static/img/voting-yes.png
similarity index 100%
rename from openslides/static/images/icons/voting-yes.png
rename to openslides/static/img/voting-yes.png
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index c40f7dc8b..3d59717ed 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -304,6 +304,12 @@ legend + .control-group {
     background-image: url("../img/glyphicons_256_delete.png");
     background-position: 0;
 }
+.icon-add-user {
+    background-image: url("../img/glyphicons_006_user_add.png");
+    background-position: 0;
+}
+
+
 
 /** Responsive **/
 @media (max-width: 767px) {