diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eebe328..c9a45b5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
@@ -29,9 +29,10 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="net.foucry.pilldroid.MedicamentListActivity" />
         </activity>
-        <activity android:name="com.google.zxing.client.android.CaptureActivity"
-            android:screenOrientation="landscape"
+        <activity
+            android:name="com.google.zxing.client.android.CaptureActivity"
             android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_small_capsule.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_small_capsule.png
deleted file mode 100644
index 29b1e1c..0000000
Binary files a/app/src/main/res/drawable-hdpi-v11/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_small_capsule.png b/app/src/main/res/drawable-hdpi/ic_stat_small_capsule.png
deleted file mode 100644
index c03a119..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stock_nok.png b/app/src/main/res/drawable-hdpi/ic_stock_nok.png
deleted file mode 100644
index 7898fa0..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stock_nok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stock_ok.png b/app/src/main/res/drawable-hdpi/ic_stock_ok.png
deleted file mode 100644
index eccb075..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stock_ok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stock_waring.png b/app/src/main/res/drawable-hdpi/ic_stock_waring.png
deleted file mode 100644
index 2a9dd9f..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_stock_waring.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_small_capsule.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_small_capsule.png
deleted file mode 100644
index a86fb06..0000000
Binary files a/app/src/main/res/drawable-mdpi-v11/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_small_capsule.png b/app/src/main/res/drawable-mdpi/ic_stat_small_capsule.png
deleted file mode 100644
index 684d30f..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stock_nok.png b/app/src/main/res/drawable-mdpi/ic_stock_nok.png
deleted file mode 100644
index 8482c37..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stock_nok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stock_ok.png b/app/src/main/res/drawable-mdpi/ic_stock_ok.png
deleted file mode 100644
index 4a84251..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stock_ok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stock_waring.png b/app/src/main/res/drawable-mdpi/ic_stock_waring.png
deleted file mode 100644
index 09a2222..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_stock_waring.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_small_capsule.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_small_capsule.png
deleted file mode 100644
index 82be692..0000000
Binary files a/app/src/main/res/drawable-xhdpi-v11/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_small_capsule.png b/app/src/main/res/drawable-xhdpi/ic_stat_small_capsule.png
deleted file mode 100644
index 55836ce..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stock_nok.png b/app/src/main/res/drawable-xhdpi/ic_stock_nok.png
deleted file mode 100644
index 4bbecd9..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stock_nok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stock_ok.png b/app/src/main/res/drawable-xhdpi/ic_stock_ok.png
deleted file mode 100644
index dbecb87..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stock_ok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stock_waring.png b/app/src/main/res/drawable-xhdpi/ic_stock_waring.png
deleted file mode 100644
index 6d47ed4..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_stock_waring.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_small_capsule.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_small_capsule.png
deleted file mode 100644
index 84be24f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_small_capsule.png b/app/src/main/res/drawable-xxhdpi/ic_stat_small_capsule.png
deleted file mode 100644
index ac6b20c..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stock_nok.png b/app/src/main/res/drawable-xxhdpi/ic_stock_nok.png
deleted file mode 100644
index ce03fb4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stock_nok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stock_ok.png b/app/src/main/res/drawable-xxhdpi/ic_stock_ok.png
deleted file mode 100644
index c2407e9..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stock_ok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stock_waring.png b/app/src/main/res/drawable-xxhdpi/ic_stock_waring.png
deleted file mode 100644
index 9587680..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_stock_waring.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_small_capsule.png b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_small_capsule.png
deleted file mode 100644
index 492b7cf..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_small_capsule.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_small_capsule.png
deleted file mode 100644
index da68f96..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stat_small_capsule.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stock_nok.png b/app/src/main/res/drawable-xxxhdpi/ic_stock_nok.png
deleted file mode 100644
index cb7e886..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stock_nok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stock_ok.png b/app/src/main/res/drawable-xxxhdpi/ic_stock_ok.png
deleted file mode 100644
index 1b1f369..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stock_ok.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stock_waring.png b/app/src/main/res/drawable-xxxhdpi/ic_stock_waring.png
deleted file mode 100644
index 9eb0901..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_stock_waring.png and /dev/null differ
diff --git a/app/src/main/res/drawable/arrow.png b/app/src/main/res/drawable/arrow.png
deleted file mode 100644
index 86e6936..0000000
Binary files a/app/src/main/res/drawable/arrow.png and /dev/null differ
diff --git a/app/src/main/res/drawable/fb_icon_play.xml b/app/src/main/res/drawable/fb_icon_play.xml
new file mode 100644
index 0000000..714fdc4
--- /dev/null
+++ b/app/src/main/res/drawable/fb_icon_play.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@android:drawable/ic_input_add" />
+    <item android:state_focused="true" android:drawable="@android:drawable/ic_input_add" />
+    <item android:drawable="@android:drawable/ic_input_add" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/fb_play_bg.xml b/app/src/main/res/drawable/fb_play_bg.xml
new file mode 100644
index 0000000..c7423ed
--- /dev/null
+++ b/app/src/main/res/drawable/fb_play_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="false" android:color="@color/colorAccent"/>
+    <item android:state_focused="true" android:state_pressed="true" android:color="@android:color/darker_gray" />
+    <item android:state_focused="false" android:state_pressed="true" android:color="@color/colorAccent" />
+    <item android:color="@color/colorAccent" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml
new file mode 100644
index 0000000..803a645
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,34 @@
+<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"
+      android:fillAlpha="1"/>
+  <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"
+      android:fillAlpha="1"/>
+  <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"
+      android:fillAlpha="1"/>
+  <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="2.1958425"
+      android:fillColor="#ffffff"
+      android:strokeColor="#ffffff"
+      android:fillAlpha="0.75"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/share_via_barcode.png b/app/src/main/res/drawable/share_via_barcode.png
deleted file mode 100644
index 56c3449..0000000
Binary files a/app/src/main/res/drawable/share_via_barcode.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_medicament_list.xml b/app/src/main/res/layout/activity_medicament_list.xml
index 19927d0..829957e 100644
--- a/app/src/main/res/layout/activity_medicament_list.xml
+++ b/app/src/main/res/layout/activity_medicament_list.xml
@@ -16,7 +16,7 @@
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:layout_height="67dp"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </android.support.design.widget.AppBarLayout>
@@ -28,19 +28,22 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <include layout="@layout/medicament_list" />
+
     </FrameLayout>
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_margin="@dimen/fab_margin"
-        android:onClick="scanNow"
-        android:src="@android:drawable/ic_input_add"
-        android:adjustViewBounds="true"
-        android:clickable="false"
-        android:baselineAlignBottom="false"/>
+    <include
+        layout="@layout/custom_button"
+        app:layout_anchor="@+id/app_bar"
+        app:layout_anchorGravity="center" />
+
+    <!--    <android.support.design.widget.FloatingActionButton
+            android:id="@+id/floatingActionButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:src="@drawable/ic_add_circle_black_60dp"
+            app:layout_anchor="@+id/frameLayout"
+            app:layout_anchorGravity="top|center" />-->
 
 
 
diff --git a/app/src/main/res/layout/app_picker_list_item.xml b/app/src/main/res/layout/app_picker_list_item.xml
deleted file mode 100644
index 0f68618..0000000
--- a/app/src/main/res/layout/app_picker_list_item.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="horizontal"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content">
-  
-  <ImageView android:id="@+id/app_picker_list_item_icon"
-             android:layout_width="64dip"
-             android:layout_height="64dip"
-             android:scaleType="centerInside"
-             android:padding="@dimen/half_padding"
-             tools:ignore="ContentDescription"/>
-  
-  <TextView android:id="@+id/app_picker_list_item_label" 
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceLarge"            
-            android:singleLine="true"
-            android:padding="@dimen/half_padding"/>
-  
-</LinearLayout>
diff --git a/app/src/main/res/layout/bookmark_picker_list_item.xml b/app/src/main/res/layout/bookmark_picker_list_item.xml
deleted file mode 100644
index 95398b4..0000000
--- a/app/src/main/res/layout/bookmark_picker_list_item.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/half_padding">
-
-  <TextView android:id="@+id/bookmark_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"            
-            android:singleLine="true"
-            android:textIsSelectable="false"/>
-
-  <TextView android:id="@+id/bookmark_url"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"                
-            android:singleLine="false"
-            android:textIsSelectable="false"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/capture.xml b/app/src/main/res/layout/capture.xml
deleted file mode 100644
index 658e0f3..0000000
--- a/app/src/main/res/layout/capture.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools">
-
-  <SurfaceView android:id="@+id/preview_view"
-               android:layout_width="fill_parent"
-               android:layout_height="fill_parent"/>
-
-  <com.google.zxing.client.android.ViewfinderView
-      android:id="@+id/viewfinder_view"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"/>
-
-  <LinearLayout android:id="@+id/result_view"
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:background="@color/result_view"
-                android:visibility="gone"
-                android:baselineAligned="false">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:padding="@dimen/standard_padding">
-
-      <LinearLayout
-          android:orientation="vertical"
-          android:layout_width="wrap_content"
-          android:layout_height="fill_parent"
-          android:gravity="right|center_vertical">
-
-        <ImageView android:id="@+id/barcode_image_view"
-                   android:layout_width="160dip"
-                   android:layout_height="wrap_content"
-                   android:maxWidth="160dip"
-                   android:maxHeight="160dip"
-                   android:layout_marginBottom="@dimen/half_padding"
-                   android:adjustViewBounds="true"
-                   android:scaleType="centerInside"
-                   tools:ignore="ContentDescription"/>
-
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-          <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/msg_default_format"
-                    android:textColor="@color/result_minor_text"
-                    android:textStyle="bold"
-                    android:paddingRight="@dimen/half_padding"/>
-
-          <TextView android:id="@+id/format_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-          <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/msg_default_type"
-                    android:textColor="@color/result_minor_text"
-                    android:textStyle="bold"
-                    android:paddingRight="@dimen/half_padding"/>
-
-          <TextView android:id="@+id/type_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-          <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/msg_default_time"
-                    android:textColor="@color/result_minor_text"
-                    android:textStyle="bold"
-                    android:paddingRight="@dimen/half_padding"/>
-
-          <TextView android:id="@+id/time_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-          <TextView android:id="@+id/meta_text_view_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/msg_default_meta"
-                    android:textColor="@color/result_minor_text"
-                    android:textStyle="bold"
-                    android:paddingRight="@dimen/half_padding"/>
-
-          <TextView android:id="@+id/meta_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"/>
-
-        </LinearLayout>
-
-      </LinearLayout>
-
-      <ScrollView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-        <LinearLayout
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:orientation="vertical">
-
-          <TextView android:id="@+id/contents_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_text"
-                    android:textColorLink="@color/result_text"
-                    android:textSize="22sp"
-                    android:paddingLeft="12dip"
-                    android:autoLink="web"
-                    android:textIsSelectable="true"/>
-
-          <TextView android:id="@+id/contents_supplement_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_text"
-                    android:textColorLink="@color/result_text"
-                    android:paddingLeft="12dip"
-                    android:autoLink="web"
-                    android:textIsSelectable="true"/>
-
-        </LinearLayout>
-
-      </ScrollView>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/result_button_view"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:gravity="center">
-
-      <Button style="@style/ResultButton"
-              android:visibility="gone"/>
-
-      <Button style="@style/ResultButton"
-              android:visibility="gone"/>
-
-      <Button style="@style/ResultButton"
-              android:visibility="gone"/>
-
-      <Button style="@style/ResultButton"
-              android:visibility="gone"/>
-
-    </LinearLayout>
-
-  </LinearLayout>
-
-  <TextView android:id="@+id/status_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center_horizontal"
-            android:background="@color/transparent"
-            android:text="@string/msg_default_status"
-            android:textColor="@color/status_text"/>
-
-</merge>
diff --git a/app/src/main/res/layout/custom_button.xml b/app/src/main/res/layout/custom_button.xml
new file mode 100644
index 0000000..8e7beed
--- /dev/null
+++ b/app/src/main/res/layout/custom_button.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fb"
+    android:layout_width="60dp"
+    android:layout_height="60dp"
+    android:layout_centerInParent="true"
+    android:layout_gravity="top|center"
+    android:backgroundTint="@drawable/fb_play_bg"
+    android:src="@drawable/fb_icon_play" />
+
+
diff --git a/app/src/main/res/layout/encode.xml b/app/src/main/res/layout/encode.xml
deleted file mode 100644
index 120935f..0000000
--- a/app/src/main/res/layout/encode.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:fillViewport="true"
-              android:background="@color/encode_view"
-              android:orientation="vertical"
-              android:gravity="center"
-              tools:ignore="Overdraw">
-
-  <ImageView android:id="@+id/image_view"
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:layout_gravity="center_horizontal"
-             android:scaleType="center"
-             tools:ignore="ContentDescription"/>
-
-  <ScrollView android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"
-              android:gravity="center">
-
-    <TextView android:id="@+id/contents_text_view"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"
-              android:gravity="center"
-              android:textColor="@color/contents_text"
-              android:paddingBottom="@dimen/standard_padding"
-              android:paddingLeft="@dimen/standard_padding"
-              android:paddingRight="@dimen/standard_padding"
-              android:textIsSelectable="true"/>
-
-  </ScrollView>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/help.xml b/app/src/main/res/layout/help.xml
deleted file mode 100644
index 786a624..0000000
--- a/app/src/main/res/layout/help.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<WebView xmlns:android="http://schemas.android.com/apk/res/android"
-         android:id="@+id/help_contents"
-         android:layout_width="fill_parent"
-         android:layout_height="fill_parent"
-         android:layout_weight="1"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml
deleted file mode 100644
index 0c060b4..0000000
--- a/app/src/main/res/layout/history_list_item.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/standard_padding">
-
-  <TextView android:id="@+id/history_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:singleLine="true"
-            android:textIsSelectable="false"/>
-
-  <TextView android:id="@+id/history_detail"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:singleLine="false"
-            android:textIsSelectable="false"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_book_contents.xml b/app/src/main/res/layout/search_book_contents.xml
deleted file mode 100644
index f572a0d..0000000
--- a/app/src/main/res/layout/search_book_contents.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent">
-
-  <LinearLayout
-      android:orientation="horizontal"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="0">
-
-    <EditText android:id="@+id/query_text_view"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="left|center_vertical"
-              android:layout_weight="1"
-              android:singleLine="true"
-              android:selectAllOnFocus="true"
-              android:inputType="text"
-              tools:ignore="NestedWeights"/>
-
-    <Button android:id="@+id/query_button"
-            style="@android:style/Widget.Holo.Button.Borderless.Small"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:text="@string/button_search_book_contents"/>
-
-  </LinearLayout>
-
-
-  <ListView android:id="@+id/result_list_view"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/search_book_contents_header.xml b/app/src/main/res/layout/search_book_contents_header.xml
deleted file mode 100644
index 09d627e..0000000
--- a/app/src/main/res/layout/search_book_contents_header.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingLeft="@dimen/standard_padding"
-          android:paddingBottom="@dimen/half_padding"
-          android:enabled="false"
-          android:singleLine="true"
-          android:textIsSelectable="false"/>
diff --git a/app/src/main/res/layout/search_book_contents_list_item.xml b/app/src/main/res/layout/search_book_contents_list_item.xml
deleted file mode 100644
index 0238154..0000000
--- a/app/src/main/res/layout/search_book_contents_list_item.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<com.google.zxing.client.android.book.SearchBookContentsListItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/standard_padding">
-
-  <TextView android:id="@+id/page_number_view"
-            android:layout_width="75dip"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left|top"
-            android:layout_marginRight="@dimen/standard_padding"
-            android:singleLine="false"
-            android:textStyle="bold"
-            android:textIsSelectable="false"/>
-
-  <TextView android:id="@+id/snippet_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left|top"
-            android:singleLine="false"
-            android:textIsSelectable="false"/>
-
-</com.google.zxing.client.android.book.SearchBookContentsListItem>
diff --git a/app/src/main/res/layout/share.xml b/app/src/main/res/layout/share.xml
deleted file mode 100644
index 785cd0f..0000000
--- a/app/src/main/res/layout/share.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<!-- ScrollView wrapper is to accommodate small screens. -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:tools="http://schemas.android.com/tools"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center">
-
-  <!-- Must wrap the rest in one layout -->
-  <LinearLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:gravity="center"
-      android:orientation="vertical"
-      android:padding="@dimen/standard_padding">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/msg_share_explanation"
-        android:paddingBottom="@dimen/standard_padding"
-        android:textIsSelectable="false"/>
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:scaleType="center"
-        android:src="@drawable/share_via_barcode"
-        android:paddingBottom="@dimen/standard_padding"
-        tools:ignore="ContentDescription"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/standard_padding">
-
-      <Button android:id="@+id/share_app_button"
-              style="@style/ShareButton"
-              android:layout_weight="1"
-              android:text="@string/button_share_app"/>
-
-      <Button android:id="@+id/share_bookmark_button"
-              style="@style/ShareButton"
-              android:layout_weight="1"
-              android:text="@string/button_share_bookmark"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/standard_padding">
-
-      <Button android:id="@+id/share_contact_button"
-              style="@style/ShareButton"
-              android:layout_weight="1"
-              android:text="@string/button_share_contact"/>
-
-      <Button android:id="@+id/share_clipboard_button"
-              style="@style/ShareButton"
-              android:layout_weight="1"
-              android:text="@string/button_share_clipboard"/>
-
-    </LinearLayout>
-
-    <EditText android:id="@+id/share_text_view"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:hint="@string/msg_share_text"
-              android:singleLine="true"
-              android:selectAllOnFocus="true"/>
-
-  </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/capture.xml b/app/src/main/res/menu/capture.xml
deleted file mode 100644
index fef1ad4..0000000
--- a/app/src/main/res/menu/capture.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/menu_share"
-        android:title="@string/menu_share"
-        android:icon="@android:drawable/ic_menu_share"
-        android:orderInCategory="1"
-        android:showAsAction="withText|ifRoom"/>
-  <item android:id="@+id/menu_history"
-        android:title="@string/menu_history"
-        android:icon="@android:drawable/ic_menu_recent_history"
-        android:orderInCategory="2"
-        android:showAsAction="withText|ifRoom"/>
-  <item android:id="@+id/menu_settings"
-        android:title="@string/menu_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:orderInCategory="3"
-        android:showAsAction="withText"/>
-  <item android:id="@+id/menu_help"
-        android:title="@string/menu_help"
-        android:icon="@android:drawable/ic_menu_help"
-        android:orderInCategory="4"
-        android:showAsAction="withText"/>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/encode.xml b/app/src/main/res/menu/encode.xml
deleted file mode 100644
index b6b1237..0000000
--- a/app/src/main/res/menu/encode.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/menu_share"
-        android:title="@string/menu_share"
-        android:icon="@android:drawable/ic_menu_share"
-        android:orderInCategory="1"
-        android:showAsAction="withText|ifRoom"/>
-  <item android:id="@+id/menu_encode"
-        android:title="@string/menu_encode_vcard"
-        android:icon="@android:drawable/ic_menu_sort_alphabetically"
-        android:orderInCategory="2"
-        android:showAsAction="withText|ifRoom"/>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/history.xml b/app/src/main/res/menu/history.xml
deleted file mode 100644
index 17faa05..0000000
--- a/app/src/main/res/menu/history.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/menu_history_send"
-        android:title="@string/history_send"
-        android:icon="@android:drawable/ic_menu_share"
-        android:orderInCategory="1"
-        android:showAsAction="withText|ifRoom"/>
-  <item android:id="@+id/menu_history_clear_text"
-        android:title="@string/history_clear_text"
-        android:icon="@android:drawable/ic_menu_delete"
-        android:orderInCategory="2"
-        android:showAsAction="withText|ifRoom"/>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/raw/beep.ogg b/app/src/main/res/raw/beep.ogg
deleted file mode 100644
index 1419947..0000000
Binary files a/app/src/main/res/raw/beep.ogg and /dev/null differ
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 08959d5..81e53ae 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -14,49 +14,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string-array name="country_codes" tools:ignore="MissingTranslation">
-    <item>-</item>
-    <item>AR</item>
-    <item>AU</item>
-    <item>BR</item>
-    <item>BG</item>
-    <item>CA</item>
-    <item>CH</item>
-    <item>CN</item>
-    <item>CZ</item>
-    <item>DE</item>
-    <item>DK</item>
-    <item>ES</item>
-    <item>FI</item>
-    <item>FR</item>
-    <item>GB</item>
-    <item>GR</item>
-    <item>HU</item>
-    <item>ID</item>
-    <item>IT</item>
-    <item>JP</item>
-    <item>KR</item>
-    <item>NL</item>
-    <item>PL</item>
-    <item>PT</item>
-    <item>RO</item>    
-    <item>RU</item>
-    <item>SE</item>
-    <item>SK</item>
-    <item>SI</item>
-    <item>TR</item>
-    <item>TW</item>
-    <item>US</item>
-  </string-array>
-  <string-array name="preferences_front_light_values" tools:ignore="MissingTranslation">
-    <item>ON</item>
-    <item>AUTO</item>
-    <item>OFF</item>
-  </string-array>
-  <string-array name="preferences_front_light_options">
-    <item>@string/preferences_front_light_on</item>
-    <item>@string/preferences_front_light_auto</item>
-    <item>@string/preferences_front_light_off</item>
-  </string-array>
-</resources>
+<resources xmlns:tools="http://schemas.android.com/tools"></resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 90633b0..079a0dc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,15 +3,7 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
-    <color name="contents_text">#ff000000</color>
-    <color name="encode_view">#ffffffff</color>
-    <color name="possible_result_points">#c0ffbd21</color> <!-- Android standard ICS color -->
-    <color name="result_minor_text">#ffc0c0c0</color>
-    <color name="result_points">#c099cc00</color> <!-- Android standard ICS color -->
-    <color name="result_text">#ffffffff</color>
-    <color name="result_view">#b0000000</color>
-    <color name="status_text">#ffffffff</color>
-    <color name="transparent">#00000000</color>
-    <color name="viewfinder_laser">#ffcc0000</color> <!-- Android standard ICS color -->
-    <color name="viewfinder_mask">#60000000</color>
+    <!-- Android standard ICS color -->
+    <!-- Android standard ICS color -->
+    <!-- Android standard ICS color -->
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 869e78e..f6b4ff2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,10 +3,5 @@
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="app_bar_height">75dp</dimen>
     <dimen name="item_width">200dp</dimen>
-    <dimen name="text_margin">16dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="standard_padding">8dip</dimen>
-    <dimen name="half_padding">4dip</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd9f3dc..c78e069 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,130 +1,8 @@
 <resources>
     <string name="app_name">PillDroid</string>
     <string name="title_medicament_detail">Medicament Detail</string>
-    <string name="app_picker_name">Applications</string>
-    <string name="bookmark_picker_name">Bookmarks</string>
-    <string name="button_add_calendar">Add to calendar</string>
-    <string name="button_add_contact">Add contact</string>
-    <string name="button_book_search">Book Search</string>
     <string name="button_cancel">Cancel</string>
-    <string name="button_custom_product_search">Custom search</string>
-    <string name="button_dial">Dial number</string>
-    <string name="button_email">Send email</string>
-    <string name="button_get_directions">Get directions</string>
-    <string name="button_mms">Send MMS</string>
     <string name="button_ok">OK</string>
-    <string name="button_open_browser">Open browser</string>
-    <string name="button_product_search">Product search</string>
-    <string name="button_search_book_contents">Search contents</string>
-    <string name="button_share_app">Application</string>
-    <string name="button_share_bookmark">Bookmark</string>
-    <string name="button_share_by_email">Share via email</string>
-    <string name="button_share_by_sms">Share via SMS</string>
-    <string name="button_share_clipboard">Clipboard</string>
-    <string name="button_share_contact">Contact</string>
-    <string name="button_show_map">Show map</string>
-    <string name="button_sms">Send SMS</string>
-    <string name="button_web_search">Web search</string>
-    <string name="button_wifi">Connect to Network</string>
-    <string name="contents_contact">Contact info</string>
-    <string name="contents_email">Email address</string>
-    <string name="contents_location">Geographic coordinates</string>
-    <string name="contents_phone">Phone number</string>
-    <string name="contents_sms">SMS address</string>
-    <string name="contents_text">Plain text</string>
-    <string name="history_clear_text">Clear history</string>
-    <string name="history_clear_one_history_text">Clear</string>
-    <string name="history_email_title">Barcode Scanner history</string>
-    <string name="history_empty">Empty</string>
-    <string name="history_empty_detail">No barcode scans have been recorded</string>
-    <string name="history_send">Send history</string>
-    <string name="history_title">History</string>
-    <string name="menu_encode_mecard">Use MECARD</string>
-    <string name="menu_encode_vcard">Use vCard</string>
-    <string name="menu_help">Help</string>
-    <string name="menu_history">History</string>
-    <string name="menu_settings">Settings</string>
-    <string name="menu_share">Share</string>
-    <string name="msg_bulk_mode_scanned">Bulk mode: barcode scanned and saved</string>
-    <string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>
-    <string name="msg_default_format">Format</string>
-    <string name="msg_default_meta">Metadata</string>
-    <string name="msg_default_mms_subject">Hi</string>
-    <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
-    <string name="msg_default_time">Time</string>
-    <string name="msg_default_type">Type</string>
-    <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.</string>
-    <string name="msg_error">Error</string>
-    <string name="msg_google_books">Google</string>
-    <string name="msg_google_product">Google</string>
-    <string name="msg_intent_failed">Sorry, the requested application could not be launched. The barcode contents may be invalid.</string>
-    <string name="msg_invalid_value">Invalid value</string>
-    <string name="msg_redirect">Redirect</string>
-    <string name="msg_sbc_book_not_searchable">Sorry, this book is not searchable.</string>
-    <string name="msg_sbc_failed">Sorry, the search encountered a problem.</string>
-    <string name="msg_sbc_no_page_returned">No page returned</string>
-    <string name="msg_sbc_page">Page</string>
-    <string name="msg_sbc_results">Results</string>
-    <string name="msg_sbc_searching_book">Searching book\u2026</string>
-    <string name="msg_sbc_snippet_unavailable">Snippet not available</string>
-    <string name="msg_share_explanation">You can share data by displaying a barcode on your screen and scanning it with another phone.</string>
-    <string name="msg_share_text">Or type some text and press Enter</string>
-    <string name="msg_sure">Are you sure?</string>
-    <string name="msg_unmount_usb">Sorry, the SD card is not accessible.</string>
-    <string name="preferences_actions_title">When a barcode is found\u2026</string>
-    <string name="preferences_auto_focus_title">Use auto focus</string>
-    <string name="preferences_auto_open_web_title">Open web pages automatically</string>
-    <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
-    <string name="preferences_bulk_mode_title">Bulk scan mode</string>
-    <string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
-    <string name="preferences_custom_product_search_summary" formatted="false">Substitutions: %s = contents, %f = format, %t = type</string>
-    <string name="preferences_custom_product_search_title">Custom search URL</string>
-    <string name="preferences_decode_1D_industrial_title">1D Industrial</string>
-    <string name="preferences_decode_1D_product_title">1D Product</string>
-    <string name="preferences_decode_Aztec_title">Aztec</string>
-    <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
-    <string name="preferences_decode_PDF417_title">PDF417 (β)</string>
-    <string name="preferences_decode_QR_title">QR Codes</string>
-    <string name="preferences_device_bug_workarounds_title">Device Bug Workarounds</string>
-    <string name="preferences_disable_barcode_scene_mode_title">No barcode scene mode</string>
-    <string name="preferences_disable_continuous_focus_summary">Use only standard focus mode</string>
-    <string name="preferences_disable_continuous_focus_title">No continuous focus</string>
-    <string name="preferences_disable_exposure_title">No exposure</string>
-    <string name="preferences_disable_metering_title">No metering</string>
-    <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
-    <string name="preferences_front_light_title">Use front light</string>
-    <string name="preferences_front_light_auto">Automatic</string>
-    <string name="preferences_front_light_off">Off</string>
-    <string name="preferences_front_light_on">On</string>
-    <string name="preferences_general_title">General settings</string>
-    <string name="preferences_history_summary">Store your scans in History</string>
-    <string name="preferences_history_title">Add to History</string>
-    <string name="preferences_invert_scan_title">Invert scan</string>
-    <string name="preferences_invert_scan_summary">Scan for white barcodes on black background. Not available on some devices.</string>
-    <string name="preferences_name">Settings</string>
-    <string name="preferences_orientation_title">No automatic rotation</string>
-    <string name="preferences_play_beep_title">Beep</string>
-    <string name="preferences_remember_duplicates_summary">Store multiple scans of the same barcode in History</string>
-    <string name="preferences_remember_duplicates_title">Remember duplicates</string>
-    <string name="preferences_result_title">Result settings</string>
-    <string name="preferences_scanning_title">When scanning for barcodes, decode\u2026</string>
-    <string name="preferences_search_country">Search country</string>
-    <string name="preferences_supplemental_summary">Try to retrieve more information about the barcode contents</string>
-    <string name="preferences_supplemental_title">Retrieve more info</string>
-    <string name="preferences_vibrate_title">Vibrate</string>
-    <string name="result_address_book">Found contact info</string>
-    <string name="result_calendar">Found calendar event</string>
-    <string name="result_email_address">Found email address</string>
-    <string name="result_geo">Found geographic coordinates</string>
-    <string name="result_isbn">Found book</string>
-    <string name="result_product">Found product</string>
-    <string name="result_sms">Found SMS address</string>
-    <string name="result_tel">Found phone number</string>
-    <string name="result_text">Found plain text</string>
-    <string name="result_uri">Found URL</string>
-    <string name="result_wifi">Found WLAN Configuration</string>
-    <string name="sbc_name">Google Book Search</string>
-    <string name="wifi_changing_network">Requesting connection to network\u2026</string>
     <string name="msgNotFound">Médicament introuvable dans la base de données</string>
     <string name="msgFound">trouvé dans la base de données</string>
     <string name="about">À propos</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8a9ee49..04fa64e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,13 +16,4 @@
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-<style name="ShareButton" parent="@android:style/Widget.Holo.Button.Borderless.Small">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-<style name="ResultButton" parent="@android:style/Widget.Holo.Button.Borderless.Small">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_weight">1</item>
-</style>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
deleted file mode 100644
index 196fed1..0000000
--- a/app/src/main/res/xml/preferences.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-  <PreferenceCategory android:title="@string/preferences_scanning_title">
-    <CheckBoxPreference
-        android:key="preferences_decode_1D_product"
-        android:defaultValue="true"
-        android:title="@string/preferences_decode_1D_product_title"/>
-    <CheckBoxPreference
-        android:key="preferences_decode_1D_industrial"
-        android:defaultValue="true"
-        android:title="@string/preferences_decode_1D_industrial_title"/>
-    <CheckBoxPreference
-        android:key="preferences_decode_QR"
-        android:defaultValue="true"
-        android:title="@string/preferences_decode_QR_title"/>
-    <CheckBoxPreference
-        android:key="preferences_decode_Data_Matrix"
-        android:defaultValue="true"
-        android:title="@string/preferences_decode_Data_Matrix_title"/>
-    <CheckBoxPreference
-        android:key="preferences_decode_Aztec"
-        android:defaultValue="false"
-        android:title="@string/preferences_decode_Aztec_title"/>
-    <CheckBoxPreference
-        android:key="preferences_decode_PDF417"
-        android:defaultValue="false"
-        android:title="@string/preferences_decode_PDF417_title"/>
-  </PreferenceCategory>
-  <PreferenceCategory android:title="@string/preferences_actions_title">
-    <CheckBoxPreference
-        android:key="preferences_play_beep"
-        android:defaultValue="true"
-        android:title="@string/preferences_play_beep_title"/>
-    <CheckBoxPreference
-        android:key="preferences_vibrate"
-        android:defaultValue="false"
-        android:title="@string/preferences_vibrate_title"/>
-    <CheckBoxPreference
-        android:key="preferences_copy_to_clipboard"
-        android:defaultValue="true"
-        android:title="@string/preferences_copy_to_clipboard_title"/>
-    <CheckBoxPreference
-        android:key="preferences_auto_open_web"
-        android:defaultValue="false"
-        android:title="@string/preferences_auto_open_web_title"/>
-    <CheckBoxPreference
-        android:key="preferences_remember_duplicates"
-        android:defaultValue="false"
-        android:title="@string/preferences_remember_duplicates_title"
-        android:summary="@string/preferences_remember_duplicates_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_history"
-        android:defaultValue="true"
-        android:title="@string/preferences_history_title"
-        android:summary="@string/preferences_history_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_supplemental"
-        android:defaultValue="true"
-        android:title="@string/preferences_supplemental_title"
-        android:summary="@string/preferences_supplemental_summary"/>
-  </PreferenceCategory>
-  <PreferenceCategory android:title="@string/preferences_general_title">
-    <ListPreference
-        android:entries="@array/preferences_front_light_options"
-        android:entryValues="@array/preferences_front_light_values"
-        android:key="preferences_front_light_mode"
-        android:defaultValue="OFF"
-        android:title="@string/preferences_front_light_title"
-        android:summary="@string/preferences_front_light_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_auto_focus"
-        android:defaultValue="true"
-        android:title="@string/preferences_auto_focus_title"/>
-    <CheckBoxPreference
-        android:key="preferences_invert_scan"
-        android:defaultValue="false"
-        android:title="@string/preferences_invert_scan_title"
-        android:summary="@string/preferences_invert_scan_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_bulk_mode"
-        android:defaultValue="false"
-        android:title="@string/preferences_bulk_mode_title"
-        android:summary="@string/preferences_bulk_mode_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_orientation"
-        android:defaultValue="true"
-        android:title="@string/preferences_orientation_title"/>
-  </PreferenceCategory>
-  <PreferenceCategory android:title="@string/preferences_result_title">
-    <EditTextPreference
-        android:key="preferences_custom_product_search"
-        android:title="@string/preferences_custom_product_search_title"
-        android:summary="@string/preferences_custom_product_search_summary"/>
-    <ListPreference
-        android:key="preferences_search_country"
-        android:defaultValue="-"
-        android:entries="@array/country_codes"
-        android:entryValues="@array/country_codes"
-        android:title="@string/preferences_search_country"/>
-  </PreferenceCategory>
-  <PreferenceCategory android:title="@string/preferences_device_bug_workarounds_title">
-    <CheckBoxPreference
-        android:key="preferences_disable_continuous_focus"
-        android:defaultValue="true"
-        android:title="@string/preferences_disable_continuous_focus_title"
-        android:summary="@string/preferences_disable_continuous_focus_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_disable_exposure"
-        android:defaultValue="true"
-        android:title="@string/preferences_disable_exposure_title"/>
-    <CheckBoxPreference
-        android:key="preferences_disable_metering"
-        android:defaultValue="true"
-        android:title="@string/preferences_disable_metering_title"/>
-    <CheckBoxPreference
-        android:key="preferences_disable_barcode_scene_mode"
-        android:defaultValue="true"
-        android:title="@string/preferences_disable_barcode_scene_mode_title"/>
-  </PreferenceCategory>
-</PreferenceScreen>