diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index 575bb09..31d371e 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -1,5 +1,9 @@
 class NeuigkeitenController < ApplicationController
   before_filter :load_toolbar_elements, :only=>[:show,:find_link]
+  before_filter :load_toolbar_elements_edit, :only=>[:edit]
+ 
+
+
   load_and_authorize_resource
 
   def show
@@ -57,7 +61,7 @@ class NeuigkeitenController < ApplicationController
 
   def edit
     @neuigkeit = Neuigkeit.find(params[:id])
-    @toolbar_elements << {:text=>I18n.t('common.show'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)} if can? :show, @neuigkeit
+
     @calentries= @neuigkeit.calentries
     @calentries<<  Calentry.new 
 
@@ -134,7 +138,12 @@ private
   end
   
 
-
+  def load_toolbar_elements_edit
+    @neuigkeit = Neuigkeit.find(params[:id])
+    @toolbar_elements=[]
+    @toolbar_elements << {:text=>I18n.t('common.show'),:path=>rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)} if can? :show, @neuigkeit
+    
+  end
 
  
 end
diff --git a/app/views/calentries/_calentry.html.erb b/app/views/calentries/_calentry.html.erb
index 7d2ec02..a187212 100644
--- a/app/views/calentries/_calentry.html.erb
+++ b/app/views/calentries/_calentry.html.erb
@@ -1,5 +1,7 @@
 <div class="contentbox">
-<%= image_tag("/iconnavy/time.png")  %>
+<% image_tag("/iconnavy/time.png")  %>
+<%= fa_icon("calendar 2x") %>
+
 <% if calentry.start.to_date == calentry.ende.to_date 
 format=:timeonly
 else
diff --git a/app/views/calentries/_nested_fields.html.erb b/app/views/calentries/_nested_fields.html.erb
index b29f4fe..e4fc987 100644
--- a/app/views/calentries/_nested_fields.html.erb
+++ b/app/views/calentries/_nested_fields.html.erb
@@ -1,6 +1,7 @@
 <div class="row-fluid">
 <div class="span1"></div><div class="span1">
-<%= image_tag("/icon_kalender_small.png")  %>
+<%= fa_icon("calendar 2x") %>
+
 </div>
 <div class="span4">
   <%= f.input :start, :as => :datepicker  %></div><div class="span4">
diff --git a/app/views/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb
index a954385..b82f795 100644
--- a/app/views/neuigkeiten/_compact.html.erb
+++ b/app/views/neuigkeiten/_compact.html.erb
@@ -16,7 +16,7 @@
   </div>
   <% if neuigkeit.has_calentries? %>
     <div class="pull-right" href="#">
-      <%= image_tag("/iconnavy/time.png")  %>
+      <%= fa_icon("calendar 2x")  %>
       <% unless neuigkeit.calentries.upcoming.empty? %>
       <%=  neuigkeit.calentries.upcoming.first.text %>
       <% else unless neuigkeit.calentries.recent.empty? %>