diff --git a/app/views/reviews/_review.html.erb b/app/views/reviews/_review.html.erb
index 26be687014198af12376919b3c2b1046f6af1426..761733968ea78c21e499f006af787b6fc12aadbb 100644
--- a/app/views/reviews/_review.html.erb
+++ b/app/views/reviews/_review.html.erb
@@ -63,11 +63,23 @@
             <% end %>
           </span> 
 
-          <%= link_to rate_review_path(id: review.id, approves: true), class: ("btn btn-default btn-xs review-button review-button-approve " + (review.user_approves?(current_user) ? "approved" : "") ), method: :post, remote: true do %>
+          
+          <% approves = review.user_approves?(current_user) %>
+          <% button_approves_class = "btn btn-default btn-xs review-button review-button-approve " %>
+          <% button_desapproves_class = "btn btn-default btn-xs review-button review-button-desapprove " %>
+          <% if !approves.nil? %>
+            <% if approves%>
+              <%button_approves_class += "approved" %>
+            <%else%>
+              <%button_desapproves_class += "desapproved" %>
+            <%end%>
+          <%end%>
+
+          <%= link_to rate_review_path(id: review.id, approves: true), class: button_approves_class, method: :post, remote: true do %>
           <i class="fa fa-thumbs-up fa-2x" aria-hidden="true"></i>
           <% end %>
           
-          <%= link_to rate_review_path(id: review.id, approves: false), class: ("btn btn-default btn-xs review-button review-button-desapprove " + (review.user_approves?(current_user) ? "": "desapproved")), method: :post, remote: true do %>
+          <%= link_to rate_review_path(id: review.id, approves: false), class: button_desapproves_class, method: :post, remote: true do %>
           <i class="fa fa-thumbs-down fa-2x" aria-hidden="true"></i>
           <% end %>