4 files changed, 48 insertions, 37 deletions

diff --git a/client/src/app/videos/video-list/video-list.component.scss b/client/src/app/videos/video-list/video-list.component.scss
index 010f0dbfe..5ece9d003 100644
--- a/client/src/app/videos/video-list/video-list.component.scss
+++ b/client/src/app/videos/video-list/video-list.component.scss
@@ -25,8 +25,10 @@
 
 .videos-miniatures {
   min-height: 720px;
+  text-align: center;
 
   my-video-miniature {
+    text-align: left;
     transition: all 0.5s ease;
 
     &.ng-enter {
diff --git a/client/src/app/videos/video-list/video-list.component.ts b/client/src/app/videos/video-list/video-list.component.ts
index b9f19b4f1..16e1b5bcc 100644
--- a/client/src/app/videos/video-list/video-list.component.ts
+++ b/client/src/app/videos/video-list/video-list.component.ts
@@ -22,7 +22,7 @@ export class VideoListComponent implements OnInit, OnDestroy {
   loading: BehaviorSubject<boolean> = new BehaviorSubject(false);
   pagination: RestPagination = {
     currentPage: 1,
-    itemsPerPage: 9,
+    itemsPerPage: 25,
     totalItems: null
   };
   sort: SortField;
diff --git a/client/src/app/videos/video-list/video-miniature.component.html b/client/src/app/videos/video-list/video-miniature.component.html
index b8b448631..0b0b0d944 100644
--- a/client/src/app/videos/video-list/video-miniature.component.html
+++ b/client/src/app/videos/video-list/video-miniature.component.html
@@ -1,4 +1,4 @@
-<div class="video-miniature col-md-4 col-sm-6 col-xs-6" (mouseenter)="onHover()" (mouseleave)="onBlur()">
+<div class="video-miniature" (mouseenter)="onHover()" (mouseleave)="onBlur()">
   <a
     [routerLink]="['/videos/watch', video.id]" [attr.title]="video.description"
     class="video-miniature-thumbnail"
@@ -8,18 +8,20 @@
       NSFW
     </div>
 
-    <span class="video-miniature-duration">{{ video.duration }}</span>
+    <div class="video-miniature-thumbnail-overlay">
+      <span class="video-miniature-thumbnail-overlay-views">{{ video.views }} views</span>
+      <span class="video-miniature-thumbnail-overlay-duration">{{ video.duration }}</span>
+    </div>
   </a>
 
+  <span
+    *ngIf="displayRemoveIcon()" (click)="removeVideo(video.id)"
+    class="video-miniature-remove glyphicon glyphicon-remove"
+  ></span>
+
   <div class="video-miniature-informations">
-    <span class="video-miniature-name-tags">
+    <span class="video-miniature-name">
       <a [routerLink]="['/videos/watch', video.id]" [attr.title]="getVideoName()" class="video-miniature-name">{{ getVideoName() }}</a>
-
-      <div class="video-miniature-tags">
-        <span *ngFor="let tag of video.tags" class="video-miniature-tag">
-          <a [routerLink]="['/videos/list', { field: 'tags', search: tag, sort: currentSort }]" class="label label-primary">{{ tag }}</a>
-        </span>
-      </div>
     </span>
 
     <a [routerLink]="['/videos/list', { field: 'author', search: video.author, sort: currentSort }]" class="video-miniature-author">{{ video.by }}</a>
diff --git a/client/src/app/videos/video-list/video-miniature.component.scss b/client/src/app/videos/video-list/video-miniature.component.scss
index f88ced819..1a73648c4 100644
--- a/client/src/app/videos/video-list/video-miniature.component.scss
+++ b/client/src/app/videos/video-list/video-miniature.component.scss
@@ -1,15 +1,11 @@
 @import "../../../sass/pre-customizations.scss";
 
 .video-miniature {
-  @media screen and (max-width: 400px) {
-    padding: 0;
-  }
-
   margin-top: 30px;
   display: inline-block;
   position: relative;
-  min-width: 220px;
   height: 190px;
+  width: 220px;
 
   .video-miniature-thumbnail {
     display: inline-block;
@@ -30,37 +26,48 @@
       height: 110px;
     }
 
-    .video-miniature-duration {
+    img, .thumbnail-nsfw {
+      border-radius: 3px;
+    }
+
+    .video-miniature-thumbnail-overlay {
       position: absolute;
-      right: 5px;
-      bottom: 2px;
+      right: 0px;
+      bottom: 0px;
       display: inline-block;
-      background-color: rgba(0, 0, 0, 0.8);
-      color: rgba(255, 255, 255, 0.8);
-      padding: 2px;
+      background-color: rgba(0, 0, 0, 0.7);
+      color: #fff;
+      padding: 3px 5px;
       font-size: 11px;
+      font-weight: bold;
+      width: 100%;
+
+      .video-miniature-thumbnail-overlay-views {
+
+      }
+
+      .video-miniature-thumbnail-overlay-duration {
+        float: right;
+      }
     }
   }
 
   .video-miniature-informations {
     width: 200px;
 
-    .video-miniature-name-tags {
+    .video-miniature-name {
+      height: 23px;
       display: block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      font-weight: bold;
+      transition: color 0.2s;
+      font-size: 15px;
+      color: $video-miniature-title-color;
 
-      .video-miniature-name {
-        height: 23px;
-        display: block;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        font-weight: bold;
-        transition: color 0.2s;
-        font-size: 15px;
-
-        &:hover {
-          text-decoration: none;
-        }
+      &:hover {
+        text-decoration: none;
       }
 
       .video-miniature-tags {
@@ -84,8 +91,8 @@
     .video-miniature-author, .video-miniature-views-created-at {
       display: block;
       margin-left: 1px;
-      font-size: 12px;
-      color: #337ab7;
+      font-size: 11px;
+      color: $video-miniature-other-infos;
       opacity: 0.9;
 
       .video-miniature-created-at::before {