diff --git a/.travis.yml b/.travis.yml
index 528b5edd3..fef282d77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,15 @@ language: android
 android:
   components:
     # The BuildTools version used by NewPipe
-    - build-tools-23.0.1
+    - build-tools-23.0.2
 
     # The SDK version used to compile NewPipe
     - android-23
-    
+
     # Additional components
     - extra-android-support
     - extra-android-m2repository
-   
+
     # Emulators
     - sys-img-armeabi-v7a-android-21
     - sys-img-armeabi-v7a-android-19
diff --git a/README.md b/README.md
index 33bcd2487..0a2e2e55c 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,12 @@ Project status:
 
 ## Screenshots
 
-[<img src="assets/screenshot_1.png" width=200>](assets/screenshot_1.png)
-[<img src="assets/screenshot_2.png" width=200>](assets/screenshot_2.png)
+[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
+[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
+[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
+[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
+[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
+[<img src="screenshots/screenshot_6.png" width=250>](screenshots/screenshot_6.png)
 
 [![Screenshot 1](assets/screenshot_1.png)](assets/screenshot_1.png)
 [![Screenshot 2](assets/screenshot_2.png)](assets/screenshot_2.png)
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index f08a46c91..ef11a8c08 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -3,12 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/video_item_search_card_vertical_margin"
-    android:paddingBottom="@dimen/video_item_search_card_vertical_margin"
-    android:paddingLeft="@dimen/video_item_search_card_horizontal_margin"
-    android:paddingRight="@dimen/video_item_search_card_horizontal_margin"
-    >
+    android:layout_height="wrap_content" >
 
     <android.support.v7.widget.CardView
         xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -17,7 +12,11 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        card_view:cardCornerRadius="@dimen/video_item_search_card_radius">
+        card_view:cardCornerRadius="@dimen/video_item_search_card_radius"
+        android:layout_marginTop="@dimen/video_item_search_card_vertical_margin"
+        android:layout_marginBottom="@dimen/video_item_search_card_vertical_margin"
+        android:layout_marginLeft="@dimen/video_item_search_card_horizontal_margin"
+        android:layout_marginRight="@dimen/video_item_search_card_horizontal_margin" >
 
         <RelativeLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b567a8999..a7b786565 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="autoPlayThroughIntentSummary">Démarrer automatiquement la vidéo si elle a été appellée à partir d\'une autre application.</string>
+    <string name="autoPlayThroughIntentSummary">Démarrer automatiquement la vidéo si elle a été appelée depuis une autre application.</string>
     <string name="cancel">Annuler</string>
-    <string name="chooseBrowser">Choisir un navigateur:</string>
-    <string name="defaultResolutionPreferenceTitle">Résolution par défaut:</string>
-    <string name="didYouMean">S\'agirait-il de:</string>
+    <string name="chooseBrowser">Choisir un navigateur :</string>
+    <string name="defaultResolutionPreferenceTitle">Résolution par défaut</string>
+    <string name="didYouMean">"S\'agirait-il de : "</string>
     <string name="download">Télécharger</string>
     <string name="downloadLocation">Emplacement des téléchargements</string>
     <string name="downloadLocationDialogTitle">Entrez l\'emplacement du téléchargement</string>
@@ -17,11 +17,11 @@
     <string name="autoPlayThroughIntentTitle">Lecture automatique via Intent</string>
     <string name="playWithKodiTitle">Lire avec Kodi</string>
     <string name="screenRotation">rotation</string>
-    <string name="search">Chercher</string>
-    <string name="searchPage">Chercher dans la page:</string>
+    <string name="search">Rechercher</string>
+    <string name="searchPage">"Rechercher dans la page : "</string>
     <string name="settings">Paramètres</string>
     <string name="share">Partager</string>
-    <string name="shareDialogTitle">Partager avec:</string>
+    <string name="shareDialogTitle">Partager avec :</string>
     <string name="showPlayWithKodiSummary">Afficher une option pour lire la vidéo avec Kodi media center.</string>
     <string name="showPlayWithKodiTitle">Afficher l\'option \"Lire avec Kodi\"</string>
     <string name="title_activity_settings">Paramètres</string>
@@ -38,4 +38,13 @@
     <string name="showNextAndSimilarTitle">Afficher les vidéos suivantes et similaires</string>
     <string name="urlNotSupportedText">URL non supportée.</string>
     <string name="showSimilarVideosButtonText">Vidéos similaires</string>
+    <string name="settingsCategoryVideoAudioTitle">VIDÉO &amp; AUDIO</string>
+    <string name="settingsCategoryVideoInfoTittle">INFORMATION</string>
+    <string name="settingsCategoryEtcTitle">DIVERS</string>
+
+    <string name="itemThumbnailViewDescription">Miniature d\'aperçu vidéo</string>
+    <string name="detailThumbnailViewDescription">Miniature d\'aperçu vidéo</string>
+    <string name="detailThumbsDownImgViewDescription">Je n\'aime pas</string>
+    <string name="detailThumbsUpImgViewDescription">J\'aime</string>
+<string name="searchLanguageTitle">Langue du contenu</string>
     </resources>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 026d0dbee..54f4d69eb 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -11,7 +11,7 @@
     <dimen name="video_item_search_thumbnail_image_width">210dp</dimen>
     <dimen name="video_item_search_thumbnail_image_height">130dp</dimen>
     <!-- Paddings & Margins -->
-    <dimen name="video_item_search_card_vertical_margin">3dp</dimen>
+    <dimen name="video_item_search_card_vertical_margin">5dp</dimen>
     <dimen name="video_item_search_card_horizontal_margin">10dp</dimen>
     <dimen name="video_item_search_card_padding">10dp</dimen>
     <dimen name="video_item_search_image_right_margin">10dp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index df9b5a64e..97df6e82b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,7 +11,7 @@
     <dimen name="video_item_search_thumbnail_image_width">140dp</dimen>
     <dimen name="video_item_search_thumbnail_image_height">85dp</dimen>
     <!-- Paddings & Margins -->
-    <dimen name="video_item_search_card_vertical_margin">2dp</dimen>
+    <dimen name="video_item_search_card_vertical_margin">3dp</dimen>
     <dimen name="video_item_search_card_horizontal_margin">6dp</dimen>
     <dimen name="video_item_search_card_padding">6dp</dimen>
     <dimen name="video_item_search_image_right_margin">6dp</dimen>
diff --git a/assets/screenshot_1.png b/assets/screenshot_1.png
deleted file mode 100644
index cba67b977..000000000
Binary files a/assets/screenshot_1.png and /dev/null differ
diff --git a/assets/screenshot_2.png b/assets/screenshot_2.png
deleted file mode 100644
index 50bd084f1..000000000
Binary files a/assets/screenshot_2.png and /dev/null differ
diff --git a/screenshots/screenshot_1.png b/screenshots/screenshot_1.png
new file mode 100644
index 000000000..32edfa9ee
Binary files /dev/null and b/screenshots/screenshot_1.png differ
diff --git a/screenshots/screenshot_2.png b/screenshots/screenshot_2.png
new file mode 100644
index 000000000..bce324736
Binary files /dev/null and b/screenshots/screenshot_2.png differ
diff --git a/screenshots/screenshot_3.png b/screenshots/screenshot_3.png
new file mode 100644
index 000000000..8277daa6d
Binary files /dev/null and b/screenshots/screenshot_3.png differ
diff --git a/screenshots/screenshot_4.png b/screenshots/screenshot_4.png
new file mode 100644
index 000000000..94f676dff
Binary files /dev/null and b/screenshots/screenshot_4.png differ
diff --git a/screenshots/screenshot_5.png b/screenshots/screenshot_5.png
new file mode 100644
index 000000000..5b33a4f46
Binary files /dev/null and b/screenshots/screenshot_5.png differ
diff --git a/screenshots/screenshot_6.png b/screenshots/screenshot_6.png
new file mode 100644
index 000000000..fd796c0cf
Binary files /dev/null and b/screenshots/screenshot_6.png differ