diff --git a/app/src/main/res/layout/welcome10.xml b/app/src/main/res/layout/welcome10.xml
index 61e60a7..be53dbb 100644
--- a/app/src/main/res/layout/welcome10.xml
+++ b/app/src/main/res/layout/welcome10.xml
@@ -14,7 +14,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/suspended_pill_slide"
+            android:src="@drawable/ic_suspended_pill"
             android:contentDescription="@string/suspended_treatment_icon" />
 
         <TextView
@@ -23,7 +23,9 @@
             android:text="@string/slide10_Pilldroid"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingStart="@dimen/title_padding"
+            android:paddingEnd="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome11.xml b/app/src/main/res/layout/welcome11.xml
index 2214a04..d0e14df 100644
--- a/app/src/main/res/layout/welcome11.xml
+++ b/app/src/main/res/layout/welcome11.xml
@@ -14,7 +14,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/content_save"
+            android:src="@drawable/ic_save_black_24dp"
             android:contentDescription="@string/save_icon" />
 
         <TextView
@@ -23,7 +23,9 @@
             android:text="@string/slide11_Pilldroid"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingStart="@dimen/title_padding"
+            android:paddingEnd="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome12.xml b/app/src/main/res/layout/welcome12.xml
index 463d90f..e0d64f7 100644
--- a/app/src/main/res/layout/welcome12.xml
+++ b/app/src/main/res/layout/welcome12.xml
@@ -23,7 +23,9 @@
             android:text="@string/slide12_Pilldroid"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingStart="@dimen/title_padding"
+            android:paddingEnd="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome2.xml b/app/src/main/res/layout/welcome2.xml
index 7eb0f7c..067f766 100644
--- a/app/src/main/res/layout/welcome2.xml
+++ b/app/src/main/res/layout/welcome2.xml
@@ -15,7 +15,7 @@
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
             android:contentDescription="@string/the_plus_icon"
-            android:src="@drawable/plus_icon_small" />
+            android:src="@drawable/ic_add_circle_black_24dp" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -24,7 +24,9 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
             android:textAlignment="center"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingEnd="@dimen/title_padding"
+            android:paddingStart="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome3.xml b/app/src/main/res/layout/welcome3.xml
index 2b8eb5c..da85a00 100644
--- a/app/src/main/res/layout/welcome3.xml
+++ b/app/src/main/res/layout/welcome3.xml
@@ -14,7 +14,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/barcode_scan"
+            android:src="@drawable/ic_barcode"
             android:contentDescription="@string/barre_code_icone" />
 
         <TextView
@@ -24,7 +24,9 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
             android:textAlignment="center"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingStart="@dimen/title_padding"
+            android:paddingEnd="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome4.xml b/app/src/main/res/layout/welcome4.xml
index f76bee0..1347aa8 100644
--- a/app/src/main/res/layout/welcome4.xml
+++ b/app/src/main/res/layout/welcome4.xml
@@ -14,7 +14,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/qr_code_scan"
+            android:src="@drawable/ic_qr_code"
             android:contentDescription="@string/qr_code_icon" />
 
         <TextView
diff --git a/app/src/main/res/layout/welcome5.xml b/app/src/main/res/layout/welcome5.xml
index 08d1a8e..1297193 100644
--- a/app/src/main/res/layout/welcome5.xml
+++ b/app/src/main/res/layout/welcome5.xml
@@ -14,17 +14,19 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/ok_stock_bitmap"
+            android:src="@drawable/ok_stock_vect"
             android:contentDescription="@string/happy_face" />
 
         <TextView
-            android:layout_width="280dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/slide5_Pilldroid"
             android:textAlignment="center"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingEnd="@dimen/title_padding"
+            android:paddingStart="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome6.xml b/app/src/main/res/layout/welcome6.xml
index c3a3157..de17969 100644
--- a/app/src/main/res/layout/welcome6.xml
+++ b/app/src/main/res/layout/welcome6.xml
@@ -15,7 +15,7 @@
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
             android:contentDescription="@string/neutral_face"
-            android:src="@drawable/warning_stock_bitmap" />
+            android:src="@drawable/warning_stock_vect" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -24,7 +24,9 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
             android:textAlignment="center"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingStart="@dimen/title_padding"
+            android:paddingEnd="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome7.xml b/app/src/main/res/layout/welcome7.xml
index 2a8eaed..f0556d7 100644
--- a/app/src/main/res/layout/welcome7.xml
+++ b/app/src/main/res/layout/welcome7.xml
@@ -16,7 +16,7 @@
         <ImageView
             android:layout_width="@dimen/img_width_height"
             android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/lower_stock_bitmap"
+            android:src="@drawable/lower_stock_vect"
             android:contentDescription="@string/unhappy_face" />
 
         <TextView
@@ -26,7 +26,9 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
             android:textAlignment="center"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingEnd="@dimen/title_padding"
+            android:paddingStart="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome8.xml b/app/src/main/res/layout/welcome8.xml
index 0644763..ea3dde9 100644
--- a/app/src/main/res/layout/welcome8.xml
+++ b/app/src/main/res/layout/welcome8.xml
@@ -23,7 +23,9 @@
             android:text="@string/slide8_Pilldroid"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingStart="@dimen/title_padding"
+            android:paddingEnd="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/welcome9.xml b/app/src/main/res/layout/welcome9.xml
index e8f9728..c6f6a57 100644
--- a/app/src/main/res/layout/welcome9.xml
+++ b/app/src/main/res/layout/welcome9.xml
@@ -24,7 +24,9 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
             android:textAlignment="center"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:paddingStart="@dimen/title_padding"
+            android:paddingEnd="@dimen/title_padding"/>
 
         <TextView
             android:layout_width="wrap_content"