diff --git a/oeffi/res/drawable/view_shadow_bottom.xml b/oeffi/res/drawable/view_shadow_bottom.xml
deleted file mode 100644
index ca937e7..0000000
--- a/oeffi/res/drawable/view_shadow_bottom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <gradient
-        android:angle="270"
-        android:endColor="#0000"
-        android:startColor="#20000000" >
-    </gradient>
-
-    <size android:height="8dp" />
-
-</shape>
diff --git a/oeffi/res/drawable/view_shadow_right.xml b/oeffi/res/drawable/view_shadow_right.xml
deleted file mode 100644
index 0beaa51..0000000
--- a/oeffi/res/drawable/view_shadow_right.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <gradient
-        android:angle="0"
-        android:endColor="#0000"
-        android:startColor="#20000000" >
-    </gradient>
-
-    <size android:width="8dp" />
-
-</shape>
diff --git a/oeffi/res/drawable/view_shadow_top.xml b/oeffi/res/drawable/view_shadow_top.xml
deleted file mode 100644
index df1261e..0000000
--- a/oeffi/res/drawable/view_shadow_top.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <gradient
-        android:angle="90"
-        android:endColor="#0000"
-        android:startColor="#20000000" >
-    </gradient>
-
-    <size android:height="8dp" />
-
-</shape>
diff --git a/oeffi/res/layout/action_bar.xml b/oeffi/res/layout/action_bar.xml
index fbe5b1c..d4d92e2 100644
--- a/oeffi/res/layout/action_bar.xml
+++ b/oeffi/res/layout/action_bar.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<de.schildbach.oeffi.MyActionBar xmlns:android="http://schemas.android.com/apk/res/android"
+<de.schildbach.oeffi.MyActionBar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/action_bar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:animateLayoutChanges="true" >
+    android:animateLayoutChanges="true"
+    android:elevation="@dimen/elevation_action_bar"
+    tools:targetApi="21">
 
     <ImageButton
         android:id="@+id/action_bar_menu_button"
diff --git a/oeffi/res/layout/directions_content.xml b/oeffi/res/layout/directions_content.xml
index 3f25d83..73741ed 100644
--- a/oeffi/res/layout/directions_content.xml
+++ b/oeffi/res/layout/directions_content.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/navigation_drawer_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent"
+        android:elevation="@dimen/elevation_content"
+        tools:targetApi="21">
 
         <LinearLayout
             android:id="@+id/directions_content_layout"
@@ -86,7 +90,8 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="top"
                     android:background="@android:color/white"
-                    android:elevation="3dp" >
+                    android:elevation="@dimen/elevation_panel"
+                    tools:targetApi="21">
 
                     <include layout="@layout/directions_form_include" />
                 </ScrollView>
@@ -100,8 +105,8 @@
         android:id="@+id/directions_map_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:foreground="@drawable/view_shadow_right"
-        android:foregroundGravity="left|fill_vertical" >
+        android:elevation="@dimen/elevation_map"
+        tools:targetApi="21">
 
         <de.schildbach.oeffi.OeffiMapView
             android:id="@+id/directions_map"
diff --git a/oeffi/res/layout/directions_trip_details_content.xml b/oeffi/res/layout/directions_trip_details_content.xml
index 71742a7..eb23a69 100644
--- a/oeffi/res/layout/directions_trip_details_content.xml
+++ b/oeffi/res/layout/directions_trip_details_content.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/stations_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <LinearLayout
         android:id="@+id/directions_trip_details_list_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical" >
+        android:orientation="vertical"
+        android:elevation="@dimen/elevation_content"
+        tools:targetApi="21">
 
         <include layout="@layout/action_bar" />
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:foreground="@drawable/view_shadow_bottom"
-            android:foregroundGravity="top|fill_horizontal" >
+            android:layout_height="match_parent">
 
             <ScrollView
                 android:layout_width="match_parent"
@@ -121,8 +122,8 @@
         android:id="@+id/directions_trip_details_map_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:foreground="@drawable/view_shadow_right"
-        android:foregroundGravity="left|fill_vertical" >
+        android:elevation="@dimen/elevation_map"
+        tools:targetApi="21">
 
         <de.schildbach.oeffi.OeffiMapView
             android:id="@+id/directions_trip_details_map"
diff --git a/oeffi/res/layout/directions_trip_overview_content.xml b/oeffi/res/layout/directions_trip_overview_content.xml
index ff78ecf..d449b34 100644
--- a/oeffi/res/layout/directions_trip_overview_content.xml
+++ b/oeffi/res/layout/directions_trip_overview_content.xml
@@ -8,9 +8,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:foreground="@drawable/view_shadow_bottom"
-        android:foregroundGravity="top|fill_horizontal" >
+        android:layout_height="match_parent">
 
         <de.schildbach.oeffi.directions.TripsGallery
             android:id="@+id/trips_bar_view"
diff --git a/oeffi/res/layout/favorites_content.xml b/oeffi/res/layout/favorites_content.xml
index f9b7bca..880ec3c 100644
--- a/oeffi/res/layout/favorites_content.xml
+++ b/oeffi/res/layout/favorites_content.xml
@@ -9,9 +9,7 @@
     <ViewAnimator
         android:id="@+id/favorites_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:foreground="@drawable/view_shadow_bottom"
-        android:foregroundGravity="top|fill_horizontal" >
+        android:layout_height="match_parent">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/favorites_list"
diff --git a/oeffi/res/layout/network_picker_content.xml b/oeffi/res/layout/network_picker_content.xml
index 7349be6..39d4d56 100644
--- a/oeffi/res/layout/network_picker_content.xml
+++ b/oeffi/res/layout/network_picker_content.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/stations_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:elevation="@dimen/elevation_content"
+    android:orientation="horizontal"
+    tools:targetApi="21">
 
     <LinearLayout
         android:id="@+id/network_picker_list_frame"
@@ -17,8 +21,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:foreground="@drawable/view_shadow_bottom"
-            android:foregroundGravity="top|fill_horizontal"
             android:orientation="vertical" >
 
             <TextView
@@ -36,21 +38,12 @@
                 android:id="@+id/network_picker_firsttime_message_shadow"
                 android:layout_width="match_parent"
                 android:layout_height="0px"
-                android:layout_weight="1"
-                android:foreground="@drawable/view_shadow_bottom"
-                android:foregroundGravity="top|fill_horizontal" >
+                android:layout_weight="1">
 
-                <FrameLayout
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@android:id/list"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:foreground="@drawable/view_shadow_top"
-                    android:foregroundGravity="bottom|fill_horizontal" >
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@android:id/list"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent" />
-                </FrameLayout>
+                    android:layout_height="match_parent" />
             </FrameLayout>
         </LinearLayout>
     </LinearLayout>
@@ -59,8 +52,7 @@
         android:id="@+id/network_picker_map_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:foreground="@drawable/view_shadow_right"
-        android:foregroundGravity="left|fill_vertical" >
+        android:elevation="@dimen/elevation_map">
 
         <de.schildbach.oeffi.OeffiMapView
             android:id="@+id/network_picker_map"
diff --git a/oeffi/res/layout/plans_picker_content.xml b/oeffi/res/layout/plans_picker_content.xml
index b550a3d..9aaba7f 100644
--- a/oeffi/res/layout/plans_picker_content.xml
+++ b/oeffi/res/layout/plans_picker_content.xml
@@ -15,9 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:animateLayoutChanges="true"
-            android:foreground="@drawable/view_shadow_bottom"
-            android:foregroundGravity="top|fill_horizontal"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/plans_picker_connectivity_warning_box"
diff --git a/oeffi/res/layout/stations_content.xml b/oeffi/res/layout/stations_content.xml
index 3e9025b..d463666 100644
--- a/oeffi/res/layout/stations_content.xml
+++ b/oeffi/res/layout/stations_content.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/navigation_drawer_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent"
+        android:elevation="@dimen/elevation_content"
+        tools:targetApi="21">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -19,9 +23,7 @@
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:foreground="@drawable/view_shadow_bottom"
-                android:foregroundGravity="top|fill_horizontal" >
+                android:layout_height="match_parent">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -402,8 +404,8 @@
         android:id="@+id/stations_map_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:foreground="@drawable/view_shadow_right"
-        android:foregroundGravity="left|fill_vertical" >
+        android:elevation="@dimen/elevation_map"
+        tools:targetApi="21">
 
         <de.schildbach.oeffi.OeffiMapView
             android:id="@+id/stations_map"
diff --git a/oeffi/res/layout/stations_station_details_content.xml b/oeffi/res/layout/stations_station_details_content.xml
index cfecc88..c4d715d 100644
--- a/oeffi/res/layout/stations_station_details_content.xml
+++ b/oeffi/res/layout/stations_station_details_content.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
-    android:orientation="horizontal" >
+    android:orientation="horizontal">
 
     <LinearLayout
         android:id="@+id/stations_station_details_list_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical" >
+        android:elevation="@dimen/elevation_content"
+        android:orientation="vertical"
+        tools:targetApi="21">
 
         <include layout="@layout/action_bar" />
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:foreground="@drawable/view_shadow_bottom"
-            android:foregroundGravity="top|fill_horizontal" >
+            android:layout_height="match_parent">
 
             <ViewAnimator
                 android:id="@+id/stations_station_details_list_layout"
@@ -78,8 +80,8 @@
         android:id="@+id/stations_station_details_map_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:foreground="@drawable/view_shadow_right"
-        android:foregroundGravity="left|fill_vertical" >
+        android:elevation="@dimen/elevation_map"
+        tools:targetApi="21">
 
         <de.schildbach.oeffi.OeffiMapView
             android:id="@+id/stations_station_details_map"
diff --git a/oeffi/res/values/dimens.xml b/oeffi/res/values/dimens.xml
index 92005d9..699adbd 100644
--- a/oeffi/res/values/dimens.xml
+++ b/oeffi/res/values/dimens.xml
@@ -44,6 +44,11 @@
     <dimen name="layout_navigation_drawer_width">300dp</dimen>
     <dimen name="layout_list_width">360dp</dimen>
 
+    <dimen name="elevation_map">0dp</dimen>
+    <dimen name="elevation_content">4dp</dimen>
+    <dimen name="elevation_panel">6dp</dimen>
+    <dimen name="elevation_action_bar">8dp</dimen>
+
     <bool name="layout_list_show">true</bool>
     <bool name="layout_map_show">false</bool>
     <bool name="layout_navigation_drawer_footer_show">false</bool>
diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
index cb3b3ee..73a8d43 100644
--- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
@@ -201,7 +201,6 @@ public abstract class OeffiMainActivity extends OeffiActivity {
                 .addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST));
         navigationDrawerListView.setAdapter(menuAdapter);
 
-        navigationDrawerLayout.setDrawerShadow(R.drawable.view_shadow_right, Gravity.LEFT);
         navigationDrawerLayout.addDrawerListener(new DrawerLayout.DrawerListener() {
             public void onDrawerOpened(final View drawerView) {
                 handler.postDelayed(() -> heartbeat.start(), 2000);