diff --git a/app/src/main/res/drawable/content_save.png b/app/src/main/res/drawable/content_save.png
deleted file mode 100644
index 9749893..0000000
Binary files a/app/src/main/res/drawable/content_save.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_baseline_add_circle_24.xml b/app/src/main/res/drawable/ic_baseline_add_circle_24.xml
deleted file mode 100644
index 2bb63e6..0000000
--- a/app/src/main/res/drawable/ic_baseline_add_circle_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_icon_officielle_android.xml b/app/src/main/res/drawable/ic_icon_officielle_android.xml
deleted file mode 100644
index bdf8385..0000000
--- a/app/src/main/res/drawable/ic_icon_officielle_android.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="1024dp"
-    android:height="1024dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
-  <path
-      android:pathData="M0,0h1024v1024h-1024z"
-      android:strokeWidth="2"
-      android:fillColor="#2c75ff"
-      android:strokeColor="#00000000"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M270.22,598.75C100.34,496.76 112.04,503.85 103.99,498.08 97.09,493.14 83.3,480.94 77.72,474.84 54.48,449.45 39.25,418.26 32.91,383.12 31.24,373.86 29.8,349.63 30.41,341.17 33.3,301.26 47.02,265.54 70.82,235.94 123.21,170.8 211.33,152.85 283.15,192.69c8.33,4.62 308.41,186.09 308.98,186.46 0.64,0.43 -1.77,0.5 -3.69,1.79 -43.37,28.95 -86.69,76.32 -118.01,129.03 -26.24,44.17 -44.75,95.02 -50.07,137.56 -1.65,13.19 -1.98,28.66 -1.39,36.02 0.17,2.08 0.49,4.23 0.24,4.25 -0.25,0.02 -67.76,-40.29 -148.99,-89.05z"
-      android:fillColor="#ff0000"
-      android:strokeColor="#00000000"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="m780.26,882.05c-1.22,-0.11 -6.22,-0.35 -11.1,-0.51 -18.42,-0.63 -37.94,-6.33 -55.42,-16.17 -4.98,-2.8 -74.42,-44.42 -154.31,-92.48l-145.25,-87.38 0.11,-11.72c0.12,-13.28 3.18,-32.51 8.11,-51.04 23.6,-88.72 84.95,-183.58 155.56,-240.53 4.14,-3.34 8.25,-6.18 9.18,-6.05 2.62,0.35 293.81,176.26 303.96,183.26 28.37,19.55 48.24,52.78 55.9,93.46 2.93,15.59 2.78,44.99 -0.32,62.58 -6.28,35.63 -19.82,66.45 -41.79,95.14 -21.43,27.99 -44.42,46.36 -74.72,59.71 -7.52,3.31 -14.6,5.32 -28.82,8.16 -10.37,2.07 -19.85,3.68 -21.07,3.56v0z"
-      android:fillColor="#ebebeb"
-      android:strokeColor="#00000000"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="m268.31,209.94c-55.66,-33.49 -118.17,-29.81 -144.71,7.13 31.24,-23.49 85.79,-21.26 135.58,8.7L861.38,588.14c22.28,13.41 40.35,30.49 53.25,48.82 -9.75,-29.09 -33.17,-58.06 -66.49,-78.11z"
-      android:strokeAlpha="0.75"
-      android:strokeWidth="5.649193"
-      android:fillColor="#ffffff"
-      android:strokeColor="#ffffff"
-      android:fillAlpha="0.75"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/app/src/main/res/drawable/icon_small.png b/app/src/main/res/drawable/icon_small.png
deleted file mode 100644
index 93d46c2..0000000
Binary files a/app/src/main/res/drawable/icon_small.png and /dev/null differ
diff --git a/app/src/main/res/drawable/lower_stock_bitmap.png b/app/src/main/res/drawable/lower_stock_bitmap.png
deleted file mode 100644
index 7a3a4d5..0000000
Binary files a/app/src/main/res/drawable/lower_stock_bitmap.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ok_stock_bitmap.png b/app/src/main/res/drawable/ok_stock_bitmap.png
deleted file mode 100644
index 160eeb7..0000000
Binary files a/app/src/main/res/drawable/ok_stock_bitmap.png and /dev/null differ
diff --git a/app/src/main/res/drawable/plus_icon_small.png b/app/src/main/res/drawable/plus_icon_small.png
deleted file mode 100644
index a313a5f..0000000
Binary files a/app/src/main/res/drawable/plus_icon_small.png and /dev/null differ
diff --git a/app/src/main/res/drawable/qr_code_scan.png b/app/src/main/res/drawable/qr_code_scan.png
deleted file mode 100644
index 619831f..0000000
Binary files a/app/src/main/res/drawable/qr_code_scan.png and /dev/null differ
diff --git a/app/src/main/res/drawable/suspended_pill.png b/app/src/main/res/drawable/suspended_pill.png
deleted file mode 100644
index 4f2843a..0000000
Binary files a/app/src/main/res/drawable/suspended_pill.png and /dev/null differ
diff --git a/app/src/main/res/drawable/suspended_pill_slide.png b/app/src/main/res/drawable/suspended_pill_slide.png
deleted file mode 100644
index 6a486d8..0000000
Binary files a/app/src/main/res/drawable/suspended_pill_slide.png and /dev/null differ
diff --git a/app/src/main/res/drawable/warning_stock_bitmap.png b/app/src/main/res/drawable/warning_stock_bitmap.png
deleted file mode 100644
index 6bc4ac3..0000000
Binary files a/app/src/main/res/drawable/warning_stock_bitmap.png and /dev/null differ
diff --git a/app/src/main/res/layout/custom_button.xml b/app/src/main/res/layout/custom_button.xml
deleted file mode 100644
index d85c631..0000000
--- a/app/src/main/res/layout/custom_button.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/fb"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_centerInParent="true"
-    android:layout_gravity="top|center"
-    android:backgroundTint="@android:color/transparent"
-    app:fabCustomSize="60dp"
-    app:maxImageSize="60dp"
-    android:src="@drawable/ic_add_circle_black_24dp"
-    android:contentDescription="@string/add_button" />
-
diff --git a/app/src/main/res/layout/welcome1.xml b/app/src/main/res/layout/welcome1.xml
index 3894641..1f8e1a3 100644
--- a/app/src/main/res/layout/welcome1.xml
+++ b/app/src/main/res/layout/welcome1.xml
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen1">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen1"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/pilldroid_icon"
+        android:src="@drawable/ic_launcher_foreground" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        tools:ignore="UselessParent">
+        android:text="@string/slide1_Pilldroid"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
 
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/ic_launcher_foreground"
-            android:contentDescription="@string/pilldroid_icon" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="58dp"
+        android:layout_marginTop="20dp"
+        android:paddingLeft="@dimen/desc_padding"
+        android:paddingRight="@dimen/desc_padding"
+        android:text="@string/slide1_desc"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_desc" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide1_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide1_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/welcome10.xml b/app/src/main/res/layout/welcome10.xml
index be53dbb..68b297e 100644
--- a/app/src/main/res/layout/welcome10.xml
+++ b/app/src/main/res/layout/welcome10.xml
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen5">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen5"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/suspended_treatment_icon"
+        android:src="@drawable/ic_suspended_pill" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide10_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
 
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/ic_suspended_pill"
-            android:contentDescription="@string/suspended_treatment_icon" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide10_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textStyle="bold"
-            android:paddingStart="@dimen/title_padding"
-            android:paddingEnd="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide10_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:paddingLeft="@dimen/desc_padding"
+        android:paddingRight="@dimen/desc_padding"
+        android:text="@string/slide10_desc"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_desc" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome11.xml b/app/src/main/res/layout/welcome11.xml
index d0e14df..07af3b1 100644
--- a/app/src/main/res/layout/welcome11.xml
+++ b/app/src/main/res/layout/welcome11.xml
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen3">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen3"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/save_icon"
+        android:src="@drawable/ic_save_black_24dp" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide11_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
 
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/ic_save_black_24dp"
-            android:contentDescription="@string/save_icon" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide11_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textStyle="bold"
-            android:paddingStart="@dimen/title_padding"
-            android:paddingEnd="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide11_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:paddingLeft="@dimen/desc_padding"
+        android:paddingRight="@dimen/desc_padding"
+        android:text="@string/slide11_desc"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_desc" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/welcome12.xml b/app/src/main/res/layout/welcome12.xml
index e0d64f7..de90b38 100644
--- a/app/src/main/res/layout/welcome12.xml
+++ b/app/src/main/res/layout/welcome12.xml
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen1">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen1"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/pilldroid_icon"
+        android:src="@drawable/ic_launcher_foreground" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide12_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
 
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/ic_launcher_foreground"
-            android:contentDescription="@string/pilldroid_icon" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide12_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textStyle="bold"
-            android:paddingStart="@dimen/title_padding"
-            android:paddingEnd="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide12_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:paddingLeft="@dimen/desc_padding"
+        android:paddingRight="@dimen/desc_padding"
+        android:text="@string/slide12_desc"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_desc" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/welcome2.xml b/app/src/main/res/layout/welcome2.xml
index 067f766..5bbb86c 100644
--- a/app/src/main/res/layout/welcome2.xml
+++ b/app/src/main/res/layout/welcome2.xml
@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen2">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen2"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/the_plus_icon"
+        android:src="@drawable/ic_add_circle_black_24dp" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide2_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
 
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:contentDescription="@string/the_plus_icon"
-            android:src="@drawable/ic_add_circle_black_24dp" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:paddingLeft="@dimen/desc_padding"
+        android:paddingRight="@dimen/desc_padding"
+        android:text="@string/slide2_desc"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_desc" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide2_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            android:paddingEnd="@dimen/title_padding"
-            android:paddingStart="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide2_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/welcome3.xml b/app/src/main/res/layout/welcome3.xml
index da85a00..2aa71b6 100644
--- a/app/src/main/res/layout/welcome3.xml
+++ b/app/src/main/res/layout/welcome3.xml
@@ -1,44 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen3">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen3"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/barre_code_icone"
+        android:src="@drawable/ic_barcode" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide3_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
 
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/ic_barcode"
-            android:contentDescription="@string/barre_code_icone" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="33dp"
+        android:layout_marginTop="20dp"
+        android:paddingLeft="@dimen/desc_padding"
+        android:paddingRight="@dimen/desc_padding"
+        android:text="@string/slide3_desc"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_desc" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide3_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            android:paddingStart="@dimen/title_padding"
-            android:paddingEnd="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide3_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/welcome4.xml b/app/src/main/res/layout/welcome4.xml
index 1347aa8..888636a 100644
--- a/app/src/main/res/layout/welcome4.xml
+++ b/app/src/main/res/layout/welcome4.xml
@@ -1,41 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen4">
+    android:background="@color/bg_screen4"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/qr_code_icon"
+        android:src="@drawable/ic_qr_code" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+        android:text="@string/slide4_Pilldroid"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
 
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/ic_qr_code"
-            android:contentDescription="@string/qr_code_icon" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_marginTop="20dp"
+        android:paddingLeft="@dimen/desc_padding"
+        android:paddingRight="@dimen/desc_padding"
+        android:text="@string/slide4_desc"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_desc" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide4_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide4_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome5.xml b/app/src/main/res/layout/welcome5.xml
index 1297193..d3ee46a 100644
--- a/app/src/main/res/layout/welcome5.xml
+++ b/app/src/main/res/layout/welcome5.xml
@@ -1,44 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen3">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen3"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/happy_face"
+        android:src="@drawable/ok_stock_vect" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide5_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
 
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/ok_stock_vect"
-            android:contentDescription="@string/happy_face" />
-
-        <TextView
-            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:paddingEnd="@dimen/title_padding"
-            android:paddingStart="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide5_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/welcome6.xml b/app/src/main/res/layout/welcome6.xml
index de17969..e96397e 100644
--- a/app/src/main/res/layout/welcome6.xml
+++ b/app/src/main/res/layout/welcome6.xml
@@ -1,45 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen2">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen2"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/neutral_face"
+        android:src="@drawable/warning_stock_vect" />
+
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
-
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:contentDescription="@string/neutral_face"
-            android:src="@drawable/warning_stock_vect" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide6_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            android:paddingStart="@dimen/title_padding"
-            android:paddingEnd="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide6_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide6_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/welcome7.xml b/app/src/main/res/layout/welcome7.xml
index f0556d7..4e0734d 100644
--- a/app/src/main/res/layout/welcome7.xml
+++ b/app/src/main/res/layout/welcome7.xml
@@ -1,46 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen4">
+    android:background="@color/bg_screen4"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
+    <ImageView
+        android:layout_width="@dimen/img_width_height"
+        android:layout_height="@dimen/img_width_height"
+        android:contentDescription="@string/unhappy_face"
+        android:src="@drawable/lower_stock_vect" />
+
+    <TextView
+        android:layout_width="349dp"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        tools:ignore="UselessParent">
-
-        <ImageView
-            android:layout_width="@dimen/img_width_height"
-            android:layout_height="@dimen/img_width_height"
-            android:src="@drawable/lower_stock_vect"
-            android:contentDescription="@string/unhappy_face" />
-
-        <TextView
-            android:layout_width="349dp"
-            android:layout_height="wrap_content"
-            android:text="@string/slide7_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            android:paddingEnd="@dimen/title_padding"
-            android:paddingStart="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide7_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide7_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/welcome8.xml b/app/src/main/res/layout/welcome8.xml
index 456538a..1a19152 100644
--- a/app/src/main/res/layout/welcome8.xml
+++ b/app/src/main/res/layout/welcome8.xml
@@ -1,43 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen1">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen1"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="@dimen/screen_shot_view_width"
-        android:layout_height="@dimen/screen_shot_view_height"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+    <ImageView
+        android:layout_width="@dimen/screen_shot_height"
+        android:layout_height="@dimen/screen_shot_height"
+        android:contentDescription="@string/drug_info"
+        android:src="@drawable/info" />
 
-        <ImageView
-            android:layout_width="@dimen/screen_shot_height"
-            android:layout_height="@dimen/screen_shot_height"
-            android:contentDescription="@string/drug_info"
-            android:src="@drawable/info" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide8_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
+</LinearLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide8_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textStyle="bold"
-            android:paddingStart="@dimen/title_padding"
-            android:paddingEnd="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide8_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/welcome9.xml b/app/src/main/res/layout/welcome9.xml
index c6f6a57..dbe164d 100644
--- a/app/src/main/res/layout/welcome9.xml
+++ b/app/src/main/res/layout/welcome9.xml
@@ -1,45 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen2">
+    android:layout_centerInParent="true"
+    android:background="@color/bg_screen2"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="@dimen/screen_shot_view_width"
-        android:layout_height="@dimen/screen_shot_view_height"
-        android:layout_centerInParent="true"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+    <ImageView
+        android:layout_width="@dimen/screen_shot_height"
+        android:layout_height="@dimen/screen_shot_height"
+        android:contentDescription="@string/tunables"
+        android:src="@drawable/tunable" />
 
-        <ImageView
-            android:layout_width="@dimen/screen_shot_height"
-            android:layout_height="@dimen/screen_shot_height"
-            android:contentDescription="@string/tunables"
-            android:src="@drawable/tunable" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/slide9_Pilldroid"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_title"
-            android:textAlignment="center"
-            android:textStyle="bold"
-            android:paddingStart="@dimen/title_padding"
-            android:paddingEnd="@dimen/title_padding"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:paddingLeft="@dimen/desc_padding"
-            android:paddingRight="@dimen/desc_padding"
-            android:text="@string/slide9_desc"
-            android:textAlignment="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/slide_desc" />
-
-    </LinearLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/title_padding"
+        android:paddingEnd="@dimen/title_padding"
+        android:text="@string/slide9_Pilldroid"
+        android:textAlignment="center"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/slide_title"
+        android:textStyle="bold" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 18f6fa8..1699167 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -14,27 +14,23 @@
     <string name="drug_warningTherehold_label">Seuil d\'alerte</string>
     <string name="msgFound">Médicament trouvé dans la base de données</string>
     <string name="drug_current_stock_label">Stock courant</string>
-    <string name="turn_off_flashlight">Éteindre le flash</string>
-    <string name="turn_on_flashlight">Allumer le flash</string>
     <string name="notification_text">Vous devez passer à la pharmacie</string>
     <string name="button_keyboard">Utilisez le clavier</string>
     <string name="detail_view">Vue de détail</string>
-    <string name="scan_action">Scanner un code barre de médicament</string>
     <string name="save_button">Enrefistrez</string>
     <string name="flashlighButton">Allumez/Éteignez le Flash</string>
     <string name="enter_cip_13_here">Enter cip 13 here..</string>
     <string name="enter_cip_13">Enter CIP 13</string>
-    <string name="input_cip13">Saissisez le code CIP 13 à l\'aide du clavier</string>
 
     <!-- Slide Strings -->
     <string name="slide1_Pilldroid">Bienvenue dans Pilldroid</string>
     <string name="slide2_Pilldroid">Pour ajouter un médicament, tapez sur le bouton « Plus »</string>
     <string name="slide3_Pilldroid">Vous pouvez scanner le code barre</string>
     <string name="slide4_Pilldroid">Ou le QRCode</string>
-    <string name="slide5_Pilldroid">Fond vert, visage souriant, le stock est bon</string>
-    <string name="slide6_Pilldroid">Fond orange, visage neutre</string>
-    <string name="slide7_Pilldroid">Fond rouge, visage grincheux</string>
-    <string name="slide9_Pilldroid">Les valeurs modifiables. Le stock est recalculé tous les jours vers midi</string>
+    <string name="slide5_Pilldroid">Fond vert, visage souriant, le stock est bon.</string>
+    <string name="slide6_Pilldroid">Fond orange, visage neutre, le stock diminue.</string>
+    <string name="slide7_Pilldroid">Fond rouge, visage grincheux le stock est bas.</string>
+    <string name="slide9_Pilldroid">Les valeurs modifiables. Le stock est recalculé tous les jours</string>
     <string name="slide8_Pilldroid">Les informations sur le médicament</string>
     <string name="slide10_Pilldroid">Traitement suspendu, la prise est mise à zéro, le stock n\'est plus calculé.</string>
     <string name="slide11_Pilldroid">L\'icone de sauvegarde de vos modifications.</string>
@@ -48,27 +44,21 @@
     <string name="happy_face">Visage souriant</string>
     <string name="barre_code_icone">Icône de code barre</string>
     <string name="qr_code_icon">icône de QR-Code</string>
-    <string name="slide5_desc">Le stock est suffisant</string>
-    <string name="slide6_desc">Attention le stock diminue</string>
-    <string name="slide7_desc">Alerte le stock est très bas</string>
     <string name="neutral_face">Visage neutre</string>
     <string name="unhappy_face">Visage grincheux</string>
-    <string name="slide8_desc">Informations sur le médicament</string>
     <string name="drug_info">Capture d\'écran sur la partie information du médicament</string>
-    <string name="slide9_desc">Réglages du stock courant, prise et valeurs d\'attention et d\'alerte</string>
     <string name="tunables">Réglages</string>
     <string name="slide10_desc">Mettre la prise à zéro suspend le traitement et les calculs de stock</string>
     <string name="suspended_treatment_icon">Icône de traitemernt suspendu</string>
     <string name="slide11_desc">Pour enregistrer les changements, utilisez l\'icône de sauvegarde</string>
     <string name="save_icon">l\'icône de sauvegarde</string>
-    <string name="slide12_desc">Plus de renseignements sur https://pilldroid.foucry.net</string>
+    <string name="slide12_desc">Plus de renseignements sur \n https://pilldroid.foucry.net</string>
     <string name="skip">Passer</string>
     <string name="next">Suivant</string>
     <string name="start">Démarrer</string>
     <string name="add_button">Ajout d\'un médicament à votre liste</string>
     <string name="drugName">Nom Médicament</string>
     <string name="stockIcon">Icône de stock</string>
-    <string name="cip13_goes_here">Ici le cip13</string>
     <string name="Date">lundi 1 janvier 2001</string>
     <string name="Value">Valeur</string>
     <string name="label">Libellé</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 599f7f3..9213a92 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,7 +4,6 @@
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
 
-    <color name="black_overlay">#66000000</color>
     <!-- slide bg -->
     <color name="bg_screen1">#4f91ff</color>
     <color name="bg_screen2">#fb9c25</color>
@@ -16,7 +15,6 @@
     <color name="dot_light">#7f7f5d</color>
     <color name="dot_dark">#000000</color>
 
-    <color name="tutorial_buttonTextColor">#000000</color>
     <color name="led">#31f623</color>
     <color name="grey">#777</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b0d7a45..a7f3f3a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,15 +3,11 @@
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="app_bar_height">75dp</dimen>
     <dimen name="item_width">200dp</dimen>
-    <dimen name="dp19">19dp</dimen>
     <dimen name="fab_height">48dp</dimen>
     <dimen name="fab_width">48dp</dimen>
-    <dimen name="fab_marginTop">32dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
 
     <!-- Slide dimens -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="dots_height">75dp</dimen>
     <dimen name="dots_margin_bottom">20dp</dimen>
     <dimen name="img_width_height">240dp</dimen>
@@ -19,9 +15,6 @@
     <dimen name="slide_desc">16sp</dimen>
     <dimen name="desc_padding">40dp</dimen>
     <dimen name="title_padding">20dp</dimen>
-    <dimen name="screen_shot_view_width">300dp</dimen>
-    <dimen name="screen_shot_view_height">350dp</dimen>
-    <dimen name="screen_shot_width">250dp</dimen>
     <dimen name="screen_shot_height">250dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index febb2af..9f45b27 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,8 +7,6 @@
     <string name="about">About</string>
     <string name="help">Help</string>
     <string name="notification_text">You have to go to the pharmacy</string>
-    <string name="turn_on_flashlight">Turn Flash On</string>
-    <string name="turn_off_flashlight">Turn Flash Off</string>
     <string name="drug_name_label">Name</string>
     <string name="drug_presention_labal">Presentation</string>
     <string name="drug_administationMode_label">Administration mode</string>
@@ -18,9 +16,7 @@
     <string name="drug_alertTherehold_label">Critical therehold</string>
     <string name="button_keyboard">"Use the keyboard"</string>
     <string name="detail_view">Detail view</string>
-    <string name="scan_action">Scan a drug barcode</string>
     <string name="save_button">Save</string>
-    <string name="input_cip13">Input Cip13 with the keyboard</string>
     <string name="flashlighButton">Toggle Flash</string>
     <string name="enter_cip_13_here">Enter cip 13 here..</string>
     <string name="enter_cip_13">Enter CIP 13</string>
@@ -41,22 +37,17 @@
     <string name="slide9_Pilldroid">Tunable</string>
     <string name="slide8_Pilldroid">Info</string>
     <string name="slide10_Pilldroid">Treatment suspended</string>
-    <string name="slide11_Pilldroid">save icone</string>
+    <string name="slide11_Pilldroid">save icon</string>
     <string name="slide12_Pilldroid">Thanks</string>
     <string name="pilldroid_icon">PillDroid Icon</string>
     <string name="the_plus_icon">The plus icon</string>
     <string name="slide4_desc">In order to find the CIP13</string>
-    <string name="slide5_desc">Stock is OK</string>
-    <string name="slide6_desc">Warning stock in rising down</string>
-    <string name="slide7_desc">Alert stock too low</string>
     <string name="happy_face">Happy face</string>
     <string name="barre_code_icone">Barre code icon</string>
     <string name="qr_code_icon">qr-code icon</string>
     <string name="neutral_face">neutral face</string>
     <string name="unhappy_face">unhappy face</string>
-    <string name="slide8_desc">Drug info</string>
     <string name="drug_info">Drug info screenshot</string>
-    <string name="slide9_desc">Tunables informations</string>
     <string name="tunables">Tunables</string>
     <string name="slide10_desc">Take to 0 to suspend treatment</string>
     <string name="suspended_treatment_icon">Treatment suspended icon</string>
@@ -70,7 +61,6 @@
     <string name="add_button">Add new drug in list</string>
     <string name="drugName">Drug Name</string>
     <string name="stockIcon">Stock Icon</string>
-    <string name="cip13_goes_here">cip13 goes here</string>
     <string name="Date">Monday January 1st 2001</string>
     <string name="Value">Value</string>
     <string name="label">Label</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 49bfb37..545b9c6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,15 +17,4 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="FullscreenTheme" parent="AppTheme">
-        <item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="metaButtonBarStyle">?android:attr/buttonBarStyle</item>
-        <item name="metaButtonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
-    </style>
-
-    <style name="FullscreenActionBarStyle" parent="Widget.AppCompat.ActionBar">
-        <item name="android:background">@color/black_overlay</item>
-    </style>
 </resources>