diff --git a/owncloud-android-library b/owncloud-android-library
index f5fbca24be..02c24c8a3b 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit f5fbca24becbb01660abe2a7013c1b536ea8a301
+Subproject commit 02c24c8a3bd87382590ece0e0744ad430718b51a
diff --git a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index e3144a4edd..5dc633767d 100644
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@ -413,8 +413,8 @@ public class ThumbnailsCacheManager {
         Paint p = new Paint();
         p.setAlpha(230);
 
-        c.drawBitmap(resizedPlayButton, (float) ((thumbnail.getWidth() / 2) - ox),
-                                        (float) ((thumbnail.getHeight() / 2) + ym), p);
+        c.drawBitmap(resizedPlayButton, (float) ((thumbnail.getWidth() / 2) + ox),
+                                        (float) ((thumbnail.getHeight() / 2) - ym), p);
 
         return resultBitmap;
     }
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 68deb031be..158d04600d 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -421,7 +421,7 @@ public class OCFileListFragment extends ExtendedListFragment {
                     foldersCount++;
                 } else {
                     filesCount++;
-                    if (file.isImage()){
+                    if (file.isImage() || file.isVideo()){
                         imagesCount++;
                     }
                 }
@@ -437,6 +437,7 @@ public class OCFileListFragment extends ExtendedListFragment {
                 switchToGridView();
             } else {
                 switchToListView();
+//                switchToGridView();
             }
         }
     }