diff --git a/layouts/article_body.html b/layouts/article_body.html
index 4b98b01b..4ff99f4c 100644
--- a/layouts/article_body.html
+++ b/layouts/article_body.html
@@ -8,10 +8,10 @@
               <% end %></h1>
               <p>
               <ul class="unstyled inline">
-                <li><i class="icon-calendar"></i> <time itemprop="dateCreated" datetime="<%= @item[:created_at].strftime("%Y-%m-%d") %>"><%= @item[:created_at].strftime("%d.%m.%Y") %></time></li>
-                <% if @item[:author] %><li><i class="icon-pencil"></i> <%= @item[:author] %></li><% end %>
-                <% if @item[:refers_to] %><li><i class="icon-cogs"></i> <a href="<%= @items[sanitize_path(@item[:refers_to])].path() %>"><%= @items[sanitize_path(@item[:refers_to])][:title] %></a></li><% end %>
-                <li><i class="icon-bookmark"></i> <a itemprop="url" href="<%= item.path() %>">Permalink</a></li>
+                <li><i class="icon-calendar" title="Datum"></i> <time itemprop="dateCreated" datetime="<%= @item[:created_at].strftime("%Y-%m-%d") %>"><%= @item[:created_at].strftime("%d.%m.%Y") %></time></li>
+                <% if @item[:author] %><li><i class="icon-pencil" title="Autor"></i> <%= @item[:author] %></li><% end %>
+                <% if @item[:refers_to] %><li><i class="icon-cogs" title="Zugehöriges Projekt"></i> <a href="<%= @items[sanitize_path(@item[:refers_to])].path() %>"><%= @items[sanitize_path(@item[:refers_to])][:title] %></a></li><% end %>
+                <li><i class="icon-bookmark" title="Permalink"></i> <a itemprop="url" href="<%= item.path() %>">Permalink</a></li>
               </ul>
             </header>
             <hr>
diff --git a/layouts/event_header.erb b/layouts/event_header.erb
index 47fb2f71..eb2ef467 100644
--- a/layouts/event_header.erb
+++ b/layouts/event_header.erb
@@ -6,14 +6,14 @@
                   <h1 itemprop="name"><%= item[:title] %></h1>
                   <% end %>
                   <% end %>
-                  <strong>Termin:</strong>
+                  <i class="icon-calendar" title="Datum"></i>
                   <span itemprop="startDate" content="<%= @item[:startdate].strftime("%Y-%m-%d") %>T19:30"><%= @item[:startdate].strftime("%d.%m.%Y") %>, 19:30 Uhr</span>
                   <% if !@item[:public] %>(nicht öffentlich)<% end %>
                   <br />
-                  <% if !heading %><strong>Thema:</strong> <span itemprop="name"><%= item[:title] %></span><br /><% end %>
+                  <% if !heading %><i class="icon-comment" title="Thema"></i> <span itemprop="name"><%= item[:title] %></span><br /><% end %>
                   <% if @item[:speakers] %>
                   <div class="commaseparated">
-                    <strong>Referent:</strong>
+                    <i class="icon-male" title="Referent"></i>
                     <ul>
                       <% @item[:speakers].each do |speaker|  %>
                       <li itemprop="performer" itemscope itemtype="http://schema.org/Person">
@@ -25,16 +25,17 @@
                   <% end %>
                   <% if @item[:superevent] %>
                   <div itemprop="superEvent" itemscope itemtype="http://schema.org/Event">
-                  <strong>Veranstaltung:</strong>
+                    <i class="icon-comments-alt" title="Veranstaltung"></i>
                   <% if @item[:superevent][:url] %>
-                  <a itemprop="url" href="<%= @item[:superevent][:url] %>"><span itemprop="name"><%= @item[:superevent][:title] %></span></a>
+                    <a itemprop="url" href="<%= @item[:superevent][:url] %>"><span itemprop="name"><%= @item[:superevent][:title] %></span></a>
                   <% else %>
-                  <span itemprop="name"><%= @item[:superevent][:title] %></span>
+                    <span itemprop="name"><%= @item[:superevent][:title] %></span>
                   <% end %>
+                  </div>
                   <% end %>
                   <% if @item[:location] %>
                   <div class="commaseparated">
-                    <strong>Ort:</strong>
+                    <i class="icon-compass" title="Ort"></i>
                     <ul itemprop="location" itemscope itemtype="http://schema.org/Location">
                       <li itemprop="name"><% if item[:location][:url] %><a itemprop="url" href="<%= item[:location][:url] %>"><%= item[:location][:name] %></a><% else %><%= item[:location][:name] %><% end %>
                       <% if item[:location][:details] %><li><%= item[:location][:details] %><% end %>