diff --git a/app/views/articles/_preview.html.erb b/app/views/articles/_preview.html.erb
index d2f46db..619f2fb 100644
--- a/app/views/articles/_preview.html.erb
+++ b/app/views/articles/_preview.html.erb
@@ -11,7 +11,7 @@
 
   <div class="comments">
     <%= link_to article do %>
-      <%= icon 'fas', 'fas', 'comments' %> Comments (<%= article.comments.count %>)
+      <%= icon 'fas', 'comments' %> Comments (<%= article.comments.count %>)
     <% end %>
   </div>
 </div>
diff --git a/app/views/articles/_top.html.erb b/app/views/articles/_top.html.erb
index 47d2826..35cd808 100644
--- a/app/views/articles/_top.html.erb
+++ b/app/views/articles/_top.html.erb
@@ -2,7 +2,7 @@
   <% if article.previous_article %>
     <div class="previous">
       <%= link_to article.previous_article do %>
-        <%= icon 'fas', 'arrow-left' %>
+        <%= icon 'arrow-left' %>
         <%= article.previous_article %>
       <% end %>
     </div>
@@ -11,7 +11,7 @@
     <div class="next">
       <%= link_to article.next_article do %>
         <%= article.next_article %>
-        <%= icon 'fas', 'arrow-right' %>
+        <%= icon 'arrow-right' %>
       <% end %>
     </div>
   <% end %>
diff --git a/app/views/contesters/_ladder.html.erb b/app/views/contesters/_ladder.html.erb
index 6c58ff4..4980141 100644
--- a/app/views/contesters/_ladder.html.erb
+++ b/app/views/contesters/_ladder.html.erb
@@ -21,17 +21,17 @@
     <tr>
       <td><%= h rank + 1%>.</td>
       <% if contester.trend == Contester::TREND_UP %>
-        <td><%= icon 'fas', 'chevron-up' %></td>
+        <td><%= icon 'chevron-up' %></td>
       <% elsif contester.trend == Contester::TREND_DOWN %>
-        <td><%= icon 'fas', 'chevron-down' %></td>
+        <td><%= icon 'chevron-down' %></td>
       <% elsif contester.trend == Contester::TREND_FLAT %>
-        <td><%= icon 'fas', 'minus' %></td>
+        <td><%= icon 'minus' %></td>
       <% else %>
         <td></td>
       <% end %>
       <td><%= flag contester.team.country %></td>
       <td><%= link_to (h contester.team.name), contester %></td>
-      <td><%= icon 'fas', 'trophy' if contester == contester.contest.winner %></td>
+      <td><%= icon 'trophy' if contester == contester.contest.winner %></td>
       <td><%= h contester.win %></td>
       <td><%= h contester.loss %></td>
       <td><%= h contester.draw %></td>
diff --git a/app/views/contesters/_list.html.erb b/app/views/contesters/_list.html.erb
index b517ce6..ba7fef9 100644
--- a/app/views/contesters/_list.html.erb
+++ b/app/views/contesters/_list.html.erb
@@ -19,17 +19,17 @@
   <% contesters.each do |contester| %>
     <tr>
       <% if contester.trend == Contester::TREND_UP %>
-        <td><%= icon 'fas', 'chevron-up' %></td>
+        <td><%= icon 'chevron-up' %></td>
       <% elsif contester.trend == Contester::TREND_DOWN %>
-        <td><%= icon 'fas', 'chevron-down' %></td>
+        <td><%= icon 'chevron-down' %></td>
       <% elsif contester.trend == Contester::TREND_FLAT %>
-        <td><%= icon 'fas', 'minus' %></td>
+        <td><%= icon 'minus' %></td>
       <% else %>
         <td></td>
       <% end %>
       <td><%= flag contester.team.country %></td>
       <td><%= link_to (h contester.team.name), contester %></td>
-      <td><%= icon 'fas', 'trophy' if contester == contester.contest.winner %></td>
+      <td><%= icon 'trophy' if contester == contester.contest.winner %></td>
       <td><%= h contester.total_score %></td>
       <td><%= h contester.win %></td>
       <td><%= h contester.loss %></td>
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index 665635a..da77de2 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -27,10 +27,10 @@
             <td class="actions">
               <% if forum.can_update? cuser %>
                 <%= link_to action: "up", id: forum do %>
-                  <% icon 'fas', 'arrow-up' %>
+                  <% icon 'arrow-up' %>
                 <% end %>
                 <%= link_to action: "down", id: forum do %>
-                  <% icon 'fas', 'arrow-down' %>
+                  <% icon 'arrow-down' %>
                 <% end %>
               <% end %>
             </td>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 1dce29c..f8faea7 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,7 +1,7 @@
 <%= provide :content_class, 'no-body' %>
 
 <div class="breadcrumbs">
-  <%= link_to "Forums", action: "index" %> <%= icon 'fas', 'chevron-right' %> <%= namelink @forum %>
+  <%= link_to "Forums", action: "index" %> <%= icon 'chevron-right' %> <%= namelink @forum %>
 </div>
 
 <div class="topic-controls">
diff --git a/app/views/gatherers/_list.html.erb b/app/views/gatherers/_list.html.erb
index 2b058af..62e9606 100644
--- a/app/views/gatherers/_list.html.erb
+++ b/app/views/gatherers/_list.html.erb
@@ -19,7 +19,7 @@
           <%= flag(gatherer.user.country) if gatherer.user && gatherer.user.country %>
 
           <% if gatherer == captain and gatherer.team == gatherer.gather.turn %>
-            <%= icon 'fas', 'chevron-right' %>
+            <%= icon 'chevron-right' %>
           <% end %>
 
           <%= namelink gatherer.user %>
diff --git a/app/views/gathers/_running.html.erb b/app/views/gathers/_running.html.erb
index 50397d5..529e917 100644
--- a/app/views/gathers/_running.html.erb
+++ b/app/views/gathers/_running.html.erb
@@ -11,7 +11,7 @@
             <%= namelink gatherer.user %>
             <% if cuser and gatherer.can_destroy?(cuser) %>
               <%= link_to gatherer, method: :delete, class: 'delete' do %>
-                <%= icon 'fas', 'times' %>
+                <%= icon 'times' %>
               <% end %>
             <% end %>
           </li>
diff --git a/app/views/gathers/index.html.erb b/app/views/gathers/index.html.erb
index 939f1b8..e4d205d 100644
--- a/app/views/gathers/index.html.erb
+++ b/app/views/gathers/index.html.erb
@@ -18,7 +18,7 @@
               <% if gatherer.team == 1 %>
                 <%= link_to gatherer.user.to_s, User.find_by_username(gatherer.user.to_s) %>
                 <% if gather.captain1 == gatherer %>
-                  <%= icon 'fas', 'star' %>
+                  <%= icon 'star' %>
                 <% end %>
               <% end %>
             </li>
@@ -32,7 +32,7 @@
               <% if gatherer.team == 2 %>
                 <%= link_to gatherer.user.to_s, User.find_by_username(gatherer.user.to_s) %>
                 <% if gather.captain2 == gatherer %>
-                  <%= icon 'fas', 'star' %>
+                  <%= icon 'star' %>
                 <% end %>
               <% end %>
             </li>
diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb
index 82d9140..904d405 100644
--- a/app/views/gathers/show.html.erb
+++ b/app/views/gathers/show.html.erb
@@ -132,14 +132,14 @@
 
   <div class="previous">
     <%= link_to @gather.previous_gather, class: 'button tiny' do %>
-      <%= icon 'fas', 'chevron-left' %> Previous
+      <%= icon 'chevron-left' %> Previous
     <% end %>
   </div>
 
   <div class="next">
     <% if @gather.next_gather %>
       <%= link_to @gather.next_gather, class: 'button tiny' do %>
-        Next <%= icon 'fas', 'chevron-right' %>
+        Next <%= icon 'chevron-right' %>
       <% end %>
     <% end %>
   </div>
@@ -188,7 +188,7 @@
 
       <div class="hide">
         <a id="gather-info-hide" class="button tiny">
-          <%= icon 'fas', 'times' %>
+          <%= icon 'times' %>
           Hide information
         </a>
       </div>
diff --git a/app/views/matches/_list.html.erb b/app/views/matches/_list.html.erb
index 8cb6e01..d5b48eb 100644
--- a/app/views/matches/_list.html.erb
+++ b/app/views/matches/_list.html.erb
@@ -47,9 +47,9 @@
       <% if match.contest.contest_type == Contest::TYPE_LADDER %>
         <td>
           <% if match.get_friendly(:points) > 0 %>
-            <%= icon 'fas', 'chevron-up' %>
+            <%= icon 'chevron-up' %>
           <% elsif match.get_friendly(:points) < 0 %>
-            <%= icon 'fas', 'chevron-down' %>
+            <%= icon 'chevron-down' %>
           <% end %>
           <%= match.get_friendly(:points) %>
         </td>
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 6246bf1..61e394c 100755
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -29,7 +29,7 @@
             <% @match.team1_lineup.each do |teamer| %>
               <li>
                 <% if teamer.user == @match.motm %>
-                  <%= icon 'fas', 'star' %>
+                  <%= icon 'star' %>
                 <% end %>
                 <%= teamer.user.username %>
                 <%= flag teamer.user.country %>
@@ -47,7 +47,7 @@
                 <%= flag teamer.user.country %>
                 <%= teamer.user.username %>  
                 <% if teamer.user == @match.motm %>
-                  <%= icon 'fas', 'star' %>
+                  <%= icon 'star' %>
                 <% end %>
               </li>
             <% end %>  
diff --git a/app/views/teams/_list.html.erb b/app/views/teams/_list.html.erb
index 0d50903..b560f56 100644
--- a/app/views/teams/_list.html.erb
+++ b/app/views/teams/_list.html.erb
@@ -18,15 +18,15 @@
         <% if cuser and cuser.admin? %>
           <td class="actions">
             <%= link_to edit_team_path(team) do %>
-              <%= icon 'fas', 'pencil' %>
+              <%= icon 'pencil' %>
             <% end %>
             <% if team.active %>
               <%= link_to team, confirm: 'Are you sure?', method: :delete do %>
-                <%= icon 'fas', 'times' %>
+                <%= icon 'times' %>
               <% end %>
             <% else %>
               <%= link_to action: "recover", id: team do %>
-                <%= icon 'fas', 'save' %>
+                <%= icon 'save' %>
               <% end %>
             <% end %>
           </td>
diff --git a/app/views/teams/edit.html.erb b/app/views/teams/edit.html.erb
index fd37d29..a0cba1a 100644
--- a/app/views/teams/edit.html.erb
+++ b/app/views/teams/edit.html.erb
@@ -74,7 +74,7 @@
               </td>
               <td>
                 <%= link_to member, confirm: 'Are you sure?', method: :delete, class: 'button tiny' do %>
-                  <%= icon 'fas', 'times' %> Remove
+                  <%= icon 'times' %> Remove
                 <% end %>
               </td>
             </tr>
diff --git a/app/views/topics/_breadcrumbs.html.erb b/app/views/topics/_breadcrumbs.html.erb
index 55bc77d..cb89e4e 100644
--- a/app/views/topics/_breadcrumbs.html.erb
+++ b/app/views/topics/_breadcrumbs.html.erb
@@ -1,7 +1,7 @@
 <div class="breadcrumbs">
   <%= link_to "Forums", forums_url %>
-  <%= icon 'fas', 'chevron-right' %>
+  <%= icon 'chevron-right' %>
   <%= namelink topic.forum %>
-  <%= icon 'fas', 'chevron-right' %>
+  <%= icon 'chevron-right' %>
   <%= namelink topic %>
 </div>
\ No newline at end of file
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 550a520..9ce4e05 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -39,10 +39,10 @@
       <% if cuser and cuser.admin? %>
         <td class="actions">
           <%= link_to edit_user_path(user) do %>
-            <%= icon 'fas', 'pencil' %>
+            <%= icon 'pencil' %>
           <% end %>
           <%= link_to user, confirm: "Proceed to delete?", method: :delete do %>
-            <%= icon 'fas', 'times' %>
+            <%= icon 'times' %>
           <% end %>
         </td>
       <% end %>
diff --git a/app/views/widgets/_logged.html.erb b/app/views/widgets/_logged.html.erb
index 2d44a0e..a54451b 100644
--- a/app/views/widgets/_logged.html.erb
+++ b/app/views/widgets/_logged.html.erb
@@ -4,29 +4,29 @@
       <% if cuser.admin? %>
         <li>
           <%= link_to '/about/adminpanel', class: 'admin' do %>
-            Admin (<%= Issue.with_status(0).count  %>) <%= icon 'fas', 'wrench' %>
+            Admin (<%= Issue.with_status(0).count  %>) <%= icon 'wrench' %>
           <% end %>
         </li>
       <% elsif cuser.moderator? %>
         <li>
           <%= link_to issues_path, class: 'admin' do %>
-            Issues (<%= Issue.where(category_id: Issue.allowed_categories(cuser)).with_status(0).count %>) <%= icon 'fas', 'wrench' %>
+            Issues (<%= Issue.where(category_id: Issue.allowed_categories(cuser)).with_status(0).count %>) <%= icon 'wrench' %>
           <% end %>
         </li>
       <% end %>
       <li>
         <%= link_to user_path(cuser) do %>
-          Account <%= icon 'fas', 'user' %>
+          Account <%= icon 'user' %>
         <% end %>
       </li>
       <li>
         <%= link_to "/users/agenda/#{cuser.id}" do %>
-          Agenda <%= icon 'fas', 'calendar' %>
+          Agenda <%= icon 'calendar' %>
         <% end %>
       </li>
       <li>
         <%= link_to messages_path do %>
-          Messages <%= icon 'fas', 'envelope' %>
+          Messages <%= icon 'envelope' %>
         <% end %>
         <% if c = cuser.new_messages.count > 0 %>
           (<%= cuser.new_messages.count %>)
@@ -35,7 +35,7 @@
       <li>
         <%= form_tag(controller: 'users', action: 'logout') do %>
           <%= link_to '#', id: 'logout' do %>
-            Logout <%= icon 'fas', 'key' %>
+            Logout <%= icon 'key' %>
           <% end %>
         <% end %>
       </li>
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index db92512..218c971 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,9 +3,10 @@ ENV["RAILS_ENV"] ||= "test"
 require 'dotenv'
 Dotenv.load('.env')
 
-require "codeclimate-test-reporter"
+# require "codeclimate-test-reporter"
 require "simplecov"
-CodeClimate::TestReporter.start
+
+# CodeClimate::TestReporter.start
 SimpleCov.start "rails"
 
 require File.expand_path("../../config/environment", __FILE__)