diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 8cf3388e68a2c7dd24495d5cd6546a2a0277e9cb..9f0492501532e0c1b47294aef88e01cad5ba1c6f 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -26,3 +26,27 @@
 $(document).ready(function () {
   $('[data-toggle="tooltip"]').tooltip();
 });
+
+$(function() {
+  return $(document).on('ajax:success', '.bookmark', function(status, data, xhr) {
+    if ( $(this).hasClass('btn-default') ) {
+      $(this).removeClass('btn-default').addClass('btn-success');
+      $(this).data('method', 'delete');
+    }
+    else {
+      $(this).removeClass('btn-success').addClass('btn-default');
+      $(this).data('method', 'post');
+    }
+  });
+});
+
+$(function() {
+  return $(document).on('ajax:success', '.like', function(status, data, xhr) {
+    if ( $(this).hasClass('btn-default') ) {
+      $(this).removeClass('btn-default').addClass('btn-primary');
+    }
+    else {
+      $(this).removeClass('btn-primary').addClass('btn-default');
+    }
+  });
+});
diff --git a/app/views/learning_objects/_bookmarks_button.html.erb b/app/views/learning_objects/_bookmarks_button.html.erb
index cd793b493cdb908b8340e07df36dee094dbb20de..4dd838d73002665f3286ce5454786e5b4ee60f40 100644
--- a/app/views/learning_objects/_bookmarks_button.html.erb
+++ b/app/views/learning_objects/_bookmarks_button.html.erb
@@ -1,3 +1,9 @@
-<%= link_to bookmark_add_path(id: learning_object.id, type: learning_object.class.to_s), class: 'btn btn-default btn-xs', title: "Adicionar aos favoritos", method: :post, remote: true do %>
-  <i class="fa fa-bookmark" aria-hidden="true"></i>
+<% unless current_user.bookmark_learning_objects.include? learning_object %>
+  <%= link_to bookmark_add_path(id: learning_object.id, type: learning_object.class.to_s), class: 'bookmark btn btn-default btn-xs', title: "Adicionar aos favoritos", method: :post, remote: true do %>
+    <i class="fa fa-bookmark" aria-hidden="true"></i>
+  <% end %>
+<% else %>
+  <%= link_to bookmark_remove_path(id: learning_object.id, type: learning_object.class.to_s), class: 'bookmark btn btn-success btn-xs', title: "Remover dos favoritos",method: :delete, remote: true do %>
+    <i class="fa fa-bookmark" aria-hidden="true"></i>
+  <% end %>
 <% end %>
diff --git a/app/views/learning_objects/_like_button.html.erb b/app/views/learning_objects/_like_button.html.erb
index 9b85fb4ea0979597f21588020819de5775e62911..4eb93f1cfd06e8b81861521d8c9adc190e5e4be9 100644
--- a/app/views/learning_objects/_like_button.html.erb
+++ b/app/views/learning_objects/_like_button.html.erb
@@ -1,3 +1,9 @@
-<%= link_to like_learning_object_path(id: learning_object.id), class: 'btn btn-primary btn-xs vote', method: :post, remote: true do %>
+<% unless learning_object.liked? current_user %>
+  <%= link_to like_learning_object_path(id: learning_object.id), class: 'like btn btn-default btn-xs vote', method: :post, remote: true do %>
+      <i class="fa fa-thumbs-up" aria-hidden="true"></i>
+  <% end %>
+<% else %>
+  <%= link_to like_learning_object_path(id: learning_object.id), class: 'like btn btn-primary btn-xs vote', method: :post, remote: true do %>
     <i class="fa fa-thumbs-up" aria-hidden="true"></i>
-<% end %>
\ No newline at end of file
+  <% end %>
+<% end %>