diff --git a/client/src/app/account/account-videos/account-videos.component.html b/client/src/app/account/account-videos/account-videos.component.html
index f73483039..0755158b9 100644
--- a/client/src/app/account/account-videos/account-videos.component.html
+++ b/client/src/app/account/account-videos/account-videos.component.html
@@ -1,3 +1,5 @@
+<div *ngIf="pagination.totalItems === 0">No results.</div>
+
 <div
   class="videos"
   infiniteScroll
diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html
index 5761f2c81..60a2563b3 100644
--- a/client/src/app/shared/video/abstract-video-list.html
+++ b/client/src/app/shared/video/abstract-video-list.html
@@ -3,6 +3,8 @@
     {{ titlePage }}
   </div>
 
+  <div *ngIf="pagination.totalItems === 0">No results.</div>
+
   <div
     class="videos"
     infiniteScroll
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index d9b572430..860edecd2 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -13,12 +13,16 @@
         <div class="video-info-name">{{ video.name }}</div>
 
         <div class="video-info-actions">
-          <div *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" class="action-button">
-            <span class="icon icon-like" title="Like this video" (click)="setLike()"></span>
+          <div
+              *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'like' }" (click)="setLike()"
+              class="action-button action-button-like">
+            <span class="icon icon-like" title="Like this video" ></span>
           </div>
 
-          <div *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" class="action-button">
-            <span class="icon icon-dislike" title="Dislike this video" (click)="setDislike()"></span>
+          <div
+              *ngIf="isUserLoggedIn()" [ngClass]="{ 'activated': userRating === 'dislike' }" (click)="setDislike()"
+              class="action-button action-button-dislike">
+            <span class="icon icon-dislike" title="Dislike this video"></span>
           </div>
 
           <div (click)="showShareModal()" class="action-button">
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index 205a4333c..02b44bda1 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -51,6 +51,12 @@
 
       .video-info-actions {
         min-width: 215px;
+        display: flex;
+        justify-content: end;
+
+        .action-button:not(:first-child), .action-more {
+          margin-left: 10px;
+        }
 
         .action-button {
           @include peertube-button;
@@ -85,12 +91,16 @@
             }
           }
 
-          &.activated {
-            @include orange-button;
+          &.action-button-like.activated {
+            background-color: #39CC0B;
 
             .icon-like {
               background-image: url('../../../assets/images/video/like-white.svg');
             }
+          }
+
+          &.action-button-dislike.activated {
+            background-color: #FF0000;
 
             .icon-dislike {
               background-image: url('../../../assets/images/video/dislike-white.svg');
@@ -222,7 +232,7 @@
 }
 
 
-@media screen and (max-width: 1200px) {
+@media screen and (max-width: 1300px) {
   .other-videos {
     display: none;
   }