diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c9a45b5..5417295 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,8 +6,8 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@drawable/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
diff --git a/app/src/main/res/layout/activity_medicament_list.xml b/app/src/main/res/layout/activity_medicament_list.xml
index 829957e..ac13e0c 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="67dp"
+            android:layout_height="@dimen/app_bar_height"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
     </android.support.design.widget.AppBarLayout>
@@ -27,24 +27,22 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <include layout="@layout/medicament_list" />
-
+        <include
+            layout="@layout/medicament_list"
+            android:layout_height="598dp" />
     </FrameLayout>
 
-    <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" />-->
-
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="bottom|end"
+        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"/>
 
 
 </android.support.design.widget.CoordinatorLayout>