diff --git a/app/public/js/common/favoriteSongDirective.js b/app/public/js/common/favoriteSongDirective.js
index 185774c5..d1ed3e95 100644
--- a/app/public/js/common/favoriteSongDirective.js
+++ b/app/public/js/common/favoriteSongDirective.js
@@ -8,7 +8,8 @@ app.directive('favoriteSong', function(
     return {
         restrict: 'A',
         scope: {
-            favorite: "="
+            favorite: "=",
+			count: "="
         },
         link: function($scope, elem, attrs) {
             var userId
@@ -25,6 +26,7 @@ app.directive('favoriteSong', function(
                             if ( typeof status == "object" ) {
                                 notificationFactory.success("Song removed from likes!");
                                 $scope.favorite = false;
+								$scope.count -= 1;
                             }
                         }, function() {
                             notificationFactory.error("Something went wrong!");
@@ -35,6 +37,7 @@ app.directive('favoriteSong', function(
                             if ( typeof status == "object" ) {
                                 notificationFactory.success("Song added to likes!");
                                 $scope.favorite = true;
+								$scope.count += 1;
                             }
                         }, function(status) {
                             notificationFactory.error("Something went wrong!");
diff --git a/app/public/stylesheets/sass/_components/_track.scss b/app/public/stylesheets/sass/_components/_track.scss
index 66252512..44db95f4 100644
--- a/app/public/stylesheets/sass/_components/_track.scss
+++ b/app/public/stylesheets/sass/_components/_track.scss
@@ -1,4 +1,11 @@
 .trackView {
+	& .likes_count {
+		&.liked {
+			& > i {
+				color: $scColor;
+			}
+		}
+	}
     & .trackDetails {
         display: flex;
 
diff --git a/app/views/common/tracks.html b/app/views/common/tracks.html
index 48b2aa1b..e7be0712 100644
--- a/app/views/common/tracks.html
+++ b/app/views/common/tracks.html
@@ -51,7 +51,7 @@ <h3 class="songList_item_song_info clearfix">
 
     <div class="songList_item_song_details">
         <div class="songList_item_actions">
-            <a favorite-song data-song-id="{{ data.id }}" favorite="data.user_favorite" ng-class="{liked: data.user_favorite}" title="{{data.user_favorite ? 'Unlike' : 'Like'}}">
+            <a favorite-song data-song-id="{{ data.id }}" favorite="data.user_favorite" count="data.favoritings_count" ng-class="{liked: data.user_favorite}" title="{{data.user_favorite ? 'Unlike' : 'Like'}}">
                 <i class="fa fa-heart"></i>
             </a>
             <a reposted-song data-song-id="{{ data.id }}" reposted="data.user_reposted" ng-class="{ reposted: data.user_reposted }" title="{{data.user_reposted ? 'Unpost' : 'Repost'}}" ng-if="data.user.id !== $root.userId">
diff --git a/app/views/track/track.html b/app/views/track/track.html
index 5576b184..9b16af8c 100644
--- a/app/views/track/track.html
+++ b/app/views/track/track.html
@@ -9,16 +9,18 @@
                     <span class="playback_count">
                         <i class="fa fa-play"></i> {{track.playback_count | number}}
                     </span>
-                    <span class="likes_count">
+                    <span class="likes_count"
+								ng-class="{liked: track.user_favorite}"
+								favorite-song data-song-id="{{ track.id }}" favorite="track.user_favorite" count="track.favoritings_count">
                         <i class="fa fa-heart"></i> {{track.favoritings_count | round}}
                     </span>
                 </div>
             </div>
         </div>
         <div class="content">
-            <div ng-click="changeLike()" ng-mouseenter="hover = true" ng-mouseleave="hover = false"
+            <div ng-mouseenter="hover = true" ng-mouseleave="hover = false"
                  ng-class="{liked: track.user_favorite}" class="button follow_button"
-                 favorite-song data-song-id="{{ track.id }}" favorite="track.user_favorite">
+                 favorite-song data-song-id="{{ track.id }}" favorite="track.user_favorite" count="track.favoritings_count">
                 <span ng-if="hover == false">{{track.user_favorite ? 'Liked' : 'Like'}}</span>
                 <span ng-if="hover == true">{{track.user_favorite ? 'Unlike' : 'Like'}}</span>
             </div>