diff --git a/objects/video.php b/objects/video.php
index 961d29daaf71..03a6dd9960a2 100644
--- a/objects/video.php
+++ b/objects/video.php
@@ -6602,7 +6602,7 @@ public static function getVideosListItem($videos_id, $divID = '', $style = '')
             return str_replace($search, $replace, $templateContent);
         }
 
-        public static function generatePlaylistButtons($videos_id, $buttonClass = 'btn btn-dark btn-xs', $iconStyle = 'color: #4285f4;', $isVertical = true)
+        public static function generatePlaylistButtons($videos_id, $buttonClass = 'btn btn-dark btn-xs', $style = 'background-color: #11111199;', $isVertical = true)
         {
             if (empty($videos_id) || !User::isLogged()) {
                 return '';
@@ -6621,8 +6621,8 @@ public static function generatePlaylistButtons($videos_id, $buttonClass = 'btn b
             $favoriteBtnStyle = $isFavorite ? "display: none;" : "";
 
             // Add a layout style to force vertical stacking if required
-            $layoutStyle = $isVertical ? "display: block; margin-bottom: 5px;" : "display: inline-block; margin-right: 5px;";
-            $layoutStyle .= 'display: none;'; 
+            $layoutStyle = $isVertical ? "display: block;" : "display: inline-block; margin-right: 5px;";
+            $layoutStyle .= 'display: none;';
             $placement = 'top';
             if ($isVertical) {
                 $placement = 'left';
@@ -6630,11 +6630,11 @@ public static function generatePlaylistButtons($videos_id, $buttonClass = 'btn b
 
             // Generate the buttons for Watch Later and Favorite
             $buttonsHTML = '
-                <button onclick="addVideoToPlayList(' . $videos_id . ', false, ' . $watchLaterId . '); return false;" class="' . $buttonClass . ' watchLaterBtnAdded watchLaterBtnAdded' . $videos_id . '" data-toggle="tooltip" data-placement="'.$placement.'" title=' . printJSString("Added On Watch Later", true) . ' style="' . $iconStyle . $watchLaterBtnAddedStyle . $layoutStyle . '">
+                <button onclick="addVideoToPlayList(' . $videos_id . ', false, ' . $watchLaterId . '); return false;" class="' . $buttonClass . ' watchLaterBtnAdded watchLaterBtnAdded' . $videos_id . '" data-toggle="tooltip" data-placement="' . $placement . '" title=' . printJSString("Added On Watch Later", true) . ' style="' . $style . $watchLaterBtnAddedStyle . $layoutStyle . '">
                     <i class="fas fa-check"></i>
                 </button>
-                <button onclick="addVideoToPlayList(' . $videos_id . ', true, ' . $watchLaterId . '); return false;" class="' . $buttonClass . ' watchLaterBtn watchLaterBtn' . $videos_id . '" data-toggle="tooltip" data-placement="'.$placement.'" title=' . printJSString("Watch Later", true) . ' style="' . $watchLaterBtnStyle . $layoutStyle . '">
-                    <i class="fas fa-clock"></i>
+                <button onclick="addVideoToPlayList(' . $videos_id . ', true, ' . $watchLaterId . '); return false;" class="' . $buttonClass . ' watchLaterBtn watchLaterBtn' . $videos_id . ' faa-parent animated-hover" data-toggle="tooltip" data-placement="' . $placement . '" title=' . printJSString("Watch Later", true) . ' style="' . $style . $watchLaterBtnStyle . $layoutStyle . '">
+                    <i class="fas fa-clock faa-spin"></i>
                 </button>';
 
             // Add line break for vertical layout
@@ -6643,10 +6643,10 @@ public static function generatePlaylistButtons($videos_id, $buttonClass = 'btn b
             }
 
             $buttonsHTML .= '
-                <button onclick="addVideoToPlayList(' . $videos_id . ', false, ' . $favoriteId . '); return false;" class="' . $buttonClass . ' favoriteBtnAdded favoriteBtnAdded' . $videos_id . '" data-toggle="tooltip" data-placement="'.$placement.'" title=' . printJSString("Added On Favorite", true) . ' style="' . $iconStyle . $favoriteBtnAddedStyle . $layoutStyle . '">
+                <button onclick="addVideoToPlayList(' . $videos_id . ', false, ' . $favoriteId . '); return false;" class="' . $buttonClass . ' favoriteBtnAdded favoriteBtnAdded' . $videos_id . '" data-toggle="tooltip" data-placement="' . $placement . '" title=' . printJSString("Added On Favorite", true) . ' style="' . $style .  $favoriteBtnAddedStyle . $layoutStyle . '">
                     <i class="fas fa-check"></i>
                 </button>
-                <button onclick="addVideoToPlayList(' . $videos_id . ', true, ' . $favoriteId . '); return false;" class="' . $buttonClass . ' favoriteBtn favoriteBtn' . $videos_id . ' faa-parent animated-hover" data-toggle="tooltip" data-placement="'.$placement.'" title=' . printJSString("Favorite", true) . ' style="' . $favoriteBtnStyle . $layoutStyle . '">
+                <button onclick="addVideoToPlayList(' . $videos_id . ', true, ' . $favoriteId . '); return false;" class="' . $buttonClass . ' favoriteBtn favoriteBtn' . $videos_id . ' faa-parent animated-hover" data-toggle="tooltip" data-placement="' . $placement . '" title=' . printJSString("Favorite", true) . ' style="' . $style .  $favoriteBtnStyle . $layoutStyle . '">
                     <i class="fas fa-heart faa-pulse faa-fast"></i>
                 </button>';
             $buttonsHTML .= '<script>$(function () {reloadPlayLists();});</script>';
@@ -6720,7 +6720,7 @@ public static function getVideoImagewithHoverAnimationFromVideosId($videos_id, $
             $galleryVideoButtons = '<!-- getVideoImagewithHoverAnimationFromVideosId generatePlaylistButtons -->';
 
             $galleryDropDownMenu = Gallery::getVideoDropdownMenu($videos_id);
-            
+
             $galleryVideoButtons .= '<!-- getVideoImagewithHoverAnimationFromVideosId -->';
             $galleryVideoButtons .= '<div class="galleryVideoButtons ' . getCSSAnimationClassAndStyle('animate__flipInY', uniqid(), 0) . '">';
             $galleryVideoButtons .= self::generatePlaylistButtons($videos_id);
@@ -6728,7 +6728,7 @@ public static function getVideoImagewithHoverAnimationFromVideosId($videos_id, $
                 $galleryVideoButtons .= '<div class="clearfix"></div>
                 <button onclick="avideoModalIframe(webSiteRootURL + \'view/managerVideosLight.php?image=1&avideoIframe=1&videos_id=' . $videos_id . '\');return false;" class="btn btn-dark btn-xs" data-toggle="tooltip" data-placement="left" title=' . printJSString("Edit Thumbnail", true) . '><i class="fas fa-edit"></i></button>';
             }
-            $galleryVideoButtons .= '<div class="clearfix"></div>'.$galleryDropDownMenu ;
+            $galleryVideoButtons .= '<div class="clearfix"></div>' . $galleryDropDownMenu;
             $galleryVideoButtons .= '</div>';
 
             // Get links for the video or playlist
diff --git a/plugin/YouPHPFlix2/view/modeFlixBody.php b/plugin/YouPHPFlix2/view/modeFlixBody.php
index 830df765ba96..055f50a1aa20 100644
--- a/plugin/YouPHPFlix2/view/modeFlixBody.php
+++ b/plugin/YouPHPFlix2/view/modeFlixBody.php
@@ -146,10 +146,12 @@
                                 ?>
                                 <span style="margin-left: 10px;">
                                     <?php
-                                        echo Video::generatePlaylistButtons($videoSerie['id'], 'btn btn-dark btn-xs', 'color: #4285f4; ', false);
+                                        echo Video::generatePlaylistButtons($videoSerie['id'], 'btn btn-dark btn-xs', 'background-color: #11111199;', false);
                                     ?>
                                 </span>
                                 <?php
+                            }else{
+                                echo '<!-- Playlists_id ['.$pl['id'].'] is not a serie -->';
                             }
                             ?>
                         </h2>
@@ -192,7 +194,7 @@
                                 </a>
                                 <span style="margin-left: 10px;">
                                 <?php
-                                    echo Video::generatePlaylistButtons($serie['id'], 'btn btn-dark btn-xs', 'color: #4285f4; ', false);
+                                    echo Video::generatePlaylistButtons($serie['id'], 'btn btn-dark btn-xs', 'background-color: #11111199;', false);
                                 ?>
                                 </span>
                             </h2>
diff --git a/plugin/YouPHPFlix2/view/row.php b/plugin/YouPHPFlix2/view/row.php
index e4d6288c46c8..db8ebbe6a048 100644
--- a/plugin/YouPHPFlix2/view/row.php
+++ b/plugin/YouPHPFlix2/view/row.php
@@ -72,6 +72,9 @@ class="tile__img <?php echo $cssClass; ?> thumbsJPG img img-responsive carousel-
                         <?php if (!empty($imgGif)) { ?>
                             <img style="position: absolute; top: 0; display: none;" src="<?php echo ImagesPlaceHolders::getImageLandscape(ImagesPlaceHolders::$RETURN_URL); ?>"  alt="<?php echo $value['title']; ?>" id="tile__img thumbsGIF<?php echo $value['id']; ?>" class="thumbsGIF img-responsive img carousel-cell-image" data-flickity-lazyload="<?php echo $imgGif; ?>" />
                         <?php } ?>
+                        <div style="position: absolute; right: 5px; top: 0;">
+                            <?php echo Video::generatePlaylistButtons($value['id'], 'btn btn-dark btn-xs', 'background-color: #11111199;'); ?>
+                        </div>
                         <?php
                         if ($advancedCustom->paidOnlyShowLabels && $obj->paidOnlyLabelOverPoster) {
                             foreach ($value['tags'] as $value2) {
diff --git a/view/css/main.css b/view/css/main.css
index e3648e36fd0f..d01bc0cfa7e1 100644
--- a/view/css/main.css
+++ b/view/css/main.css
@@ -1000,6 +1000,10 @@ img.blur {
     border-color: #000;
 }
 
+.btn-dark.watchLaterBtnAdded, .btn-dark.favoriteBtnAdded {
+    color: #4285f4;
+}
+
 .opacityBtn {
     opacity: 0.2;
 }