diff --git a/app/src/main/res/layout/custom_barcode_scanner.xml b/app/src/main/res/layout/custom_barcode_scanner.xml
index 42744c7..693d1c6 100644
--- a/app/src/main/res/layout/custom_barcode_scanner.xml
+++ b/app/src/main/res/layout/custom_barcode_scanner.xml
@@ -9,7 +9,6 @@
         android:id="@+id/zxing_barcode_surface"
         app:zxing_framing_rect_width="250dp"
         app:zxing_framing_rect_height="50dp">
-
     </com.journeyapps.barcodescanner.BarcodeView>
 
     <com.journeyapps.barcodescanner.ViewfinderView
@@ -17,7 +16,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:background="#FFFFFF"
         app:zxing_possible_result_points="@color/zxing_custom_possible_result_points"
         app:zxing_result_view="@color/zxing_custom_result_view"
         app:zxing_viewfinder_laser="@color/zxing_custom_viewfinder_laser"
@@ -28,31 +26,33 @@
         android:id="@+id/zxing_status_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
+        android:layout_gravity="top|center_horizontal"
         android:background="@color/zxing_transparent"
         android:text="@string/zxing_msg_default_status"
         android:textColor="@color/zxing_status_text"/>
 
     <ImageButton
         android:id="@+id/cancel_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
         android:layout_gravity="bottom|start"
-        android:layout_marginStart="5dp"
-        android:layout_marginBottom="5dp"
-        android:background="#00FFFFFF"
+        android:layout_margin="@dimen/fab_margin"
+        android:accessibilityHeading="true"
+        android:backgroundTint="@android:color/transparent"
+        android:clickable="false"
         android:contentDescription="@string/button_cancel"
+        android:cropToPadding="false"
+        android:foregroundTint="@android:color/darker_gray"
         android:onClick="onCancel"
-        android:visibility="visible"
-        tools:src="@drawable/ic_cancel_black_24dp" />
+        android:src="@drawable/ic_cancel_black_24dp" />
 
     <ImageButton
         android:id="@+id/keyboard_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center|end"
-        android:layout_marginEnd="5dp"
-        android:background="#00FFFFFF"
+        android:layout_width="86dp"
+        android:layout_height="60dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:backgroundTint="@android:color/transparent"
         android:contentDescription="@string/button_keyboard"
         android:onClick="onKeyboard"
         android:src="@drawable/ic_keyboard_black_24dp" />