diff --git a/templates/group/group_view.twig b/templates/group/group_view.twig
index c0effeee0db6fd2eb58445b155ff1d80053f2fb8..b472c1170abc0333db3f8fa9f95cf3679221ad05 100644
--- a/templates/group/group_view.twig
+++ b/templates/group/group_view.twig
@@ -12,11 +12,18 @@
       <div class="description" id="description">
         <p>{{group.description}}</p>
       </div>
-      {% if session.userId %}
-      <a href="/groups/{{group.getId}}/messages">Messages</a>
-      {% endif %}
       <div class="extra content" id="icons_users">
         <div class="ui small basic icon buttons">
+          {% if session.userId %}
+          <button class="ui button">
+            <a href="/groups/{{group.getId}}/messages"><i class="envelope icon"></i></a>
+          </button>
+          {% endif %}
+          {% if session.userId and group.hasUser(session.userId) == false %}
+            <form action="/groups/{{group.getId}}/users/add" method="post">
+              <button type="submit" class="ui button"><i class="user plus icon"></i></button>
+            </form>
+          {% endif %}
           {% if group.checkAdmin(session.userId) %}
           <form action="/groups/{{group.getId}}/modify" method="get">
             <button type="submit" class="ui button"><i class="edit icon"></i></button>
@@ -26,11 +33,6 @@
           </form>
           <button class="ui button" id="add-user-button"><i class="user plus icon"></i> Add a member </button>
           {% endif %}
-          {% if session.userId and group.hasUser(session.userId) == false %}
-            <form action="/groups/{{group.getId}}/users/add" method="post">
-              <button type="submit" class="ui button"><i class="user plus icon"></i></button>
-            </form>
-          {% endif %}
         </div>
       </div>
     </div>