diff --git a/XYZReader/src/main/res/layout/activity_article_list.xml b/XYZReader/src/main/res/layout/activity_article_list.xml
index 7330f47..6e97879 100644
--- a/XYZReader/src/main/res/layout/activity_article_list.xml
+++ b/XYZReader/src/main/res/layout/activity_article_list.xml
@@ -22,6 +22,7 @@
     </android.support.v4.widget.SwipeRefreshLayout>
 
     <android.support.design.widget.AppBarLayout
+        app:elevation="@dimen/appbar_elevation"
         android:id="@+id/toolbar_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
diff --git a/XYZReader/src/main/res/layout/fragment_article_detail.xml b/XYZReader/src/main/res/layout/fragment_article_detail.xml
index 8e8d27e..6dedd75 100644
--- a/XYZReader/src/main/res/layout/fragment_article_detail.xml
+++ b/XYZReader/src/main/res/layout/fragment_article_detail.xml
@@ -96,16 +96,16 @@
         </FrameLayout>
     </com.example.xyzreader.ui.ObservableScrollView>
 
-    <ImageButton android:id="@+id/share_fab"
-        android:stateListAnimator="@anim/fab_state_list_anim"
-        android:background="@drawable/add_fab_background"
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/share_fab"
         android:layout_gravity="bottom|end"
         android:layout_marginRight="@dimen/fab_margin"
         android:layout_marginBottom="@dimen/fab_margin"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:fabSize="normal"
         android:src="@drawable/ic_share"
-        android:elevation="@dimen/fab_elevation"
+        app:elevation="@dimen/fab_elevation"
         android:contentDescription="@string/action_share" />
 
 </com.example.xyzreader.ui.DrawInsetsFrameLayout>
diff --git a/XYZReader/src/main/res/layout/list_item_article.xml b/XYZReader/src/main/res/layout/list_item_article.xml
index 314255d..3e51ba7 100644
--- a/XYZReader/src/main/res/layout/list_item_article.xml
+++ b/XYZReader/src/main/res/layout/list_item_article.xml
@@ -9,6 +9,7 @@
     android:layout_marginTop="4dp"
     android:clickable="true"
     android:focusable="true"
+    app:elevation="@dimen/card_elevation"
     android:foreground="?selectableItemBackground">
 
     <LinearLayout
diff --git a/XYZReader/src/main/res/values/dimens.xml b/XYZReader/src/main/res/values/dimens.xml
index f8bad8c..4cd3f35 100644
--- a/XYZReader/src/main/res/values/dimens.xml
+++ b/XYZReader/src/main/res/values/dimens.xml
@@ -4,8 +4,12 @@
     <dimen name="detail_body_text_size">22sp</dimen>
     <item name="detail_body_line_spacing_multiplier" format="float" type="fraction">1.25</item>
 
-    <dimen name="fab_elevation">2dp</dimen>
+    <dimen name="fab_elevation">6dp</dimen>
     <dimen name="fab_press_translation_z">6dp</dimen>
     <dimen name="fab_margin">24dp</dimen>
 
+    <dimen name="card_elevation">2dp</dimen>
+    <dimen name="card_elevation_translation_z">6dp</dimen>
+    <dimen name="appbar_elevation">2dp</dimen>
+
 </resources>