diff --git a/app/views/flags/_flaglink.html.erb b/app/views/flags/_flaglink.html.erb
index 1c72811..3c515df 100644
--- a/app/views/flags/_flaglink.html.erb
+++ b/app/views/flags/_flaglink.html.erb
@@ -1 +1,2 @@
-<%=  flag_link(@obj,flag, content_tag("i", "", class: icon")) %>
+<%       fi = {"badquality"=>"fa fa-flag", "delete"=>"fa fa-trash"} %>
+<%=  flag_link(@obj,flag, ff_icon(fi[flag])) %>
diff --git a/app/views/themes/blue2/beispiele/_beispiel.html.erb b/app/views/themes/blue2/beispiele/_beispiel.html.erb
index 25b7bb9..2fd1ed6 100644
--- a/app/views/themes/blue2/beispiele/_beispiel.html.erb
+++ b/app/views/themes/blue2/beispiele/_beispiel.html.erb
@@ -7,8 +7,9 @@
       <%= (beispiel.beispieldatei.size/1024.0).round(2).to_s  %>KiB   
     </div>
     <div class="span5">
-			<%= flag_link(beispiel, "badquality", ff_icon(Beispiel.FLAG_ICONS["badquality"]))%>
-			<%= flag_link(beispiel, "delete", fa_icon("flag"))%>
+<%       fi = {"badquality"=>"fa fa-flag", "delete"=>"fa fa-trash"} %>		
+	<%= flag_link(beispiel, "badquality", ff_icon(fi["badquality"]))%>
+			<%= flag_link(beispiel, "delete", ff_icon(fi["delete"]))%>
 
 			<%= 
 	 if can?(:like, beispiel)
diff --git a/lib/flagable.rb b/lib/flagable.rb
index 7193c2c..5add5e0 100644
--- a/lib/flagable.rb
+++ b/lib/flagable.rb
@@ -11,14 +11,14 @@ module Flagable
       end
     end
     module LocalClassMethods
-       FLAG_ICONS = {"badquality"=>"fa fa-flag", "delete"=>"icon-trash"}
-
+   
     end
     module LocalInstanceMethods
- 
+      
       def flag
+      fi = {"badquality"=>"fa fa-flag", "delete"=>"fa fa-trash"}
  
-       @obj=controller_name.classify.constantize.find(params[:id])
+        @obj=controller_name.classify.constantize.find(params[:id])
         lflag=("flag_"+params[:flag]).to_sym
         unless params[:flag].nil? || params[:flag].empty? || params[:value].nil?
           if @obj.respond_to?(lflag.to_s+"=")
@@ -27,8 +27,8 @@ module Flagable
           end
         end
         respond_to do |format|
-          format.html {render partial: "flags/flaglink", locals: {flag: params[:flag],icon: controller_name.classify.constantize.FLAG_ICONS[params[:flag]]}}
-          format.js {render partial: "flags/flag", locals: {flag: params[:flag],icon:  controller_name.classify.constantize.FLAG_ICONS[params[:flag]]}}
+          format.html {render partial: "flags/flaglink", locals: {flag: params[:flag],icon: fi[params[:flag]]}}
+          format.js {render partial: "flags/flag", locals: {flag: params[:flag], icon: fi[params[:flag]]}}
         end
       end
     end