diff --git a/app/src/main/res/drawable-hdpi/ic_access_time_grey600_18dp.png b/app/src/main/res/drawable-hdpi/ic_access_time_grey600_18dp.png
new file mode 100644
index 0000000..ae01252
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_access_time_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_offer_black_18dp.png b/app/src/main/res/drawable-hdpi/ic_local_offer_black_18dp.png
new file mode 100644
index 0000000..83f8cc4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_local_offer_black_18dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_local_offer_grey600_18dp.png b/app/src/main/res/drawable-hdpi/ic_local_offer_grey600_18dp.png
new file mode 100644
index 0000000..84d7e0f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_local_offer_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_place_grey600_18dp.png b/app/src/main/res/drawable-hdpi/ic_place_grey600_18dp.png
new file mode 100644
index 0000000..689e9e8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_place_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_small_labels.png b/app/src/main/res/drawable-hdpi/ic_small_labels.png
deleted file mode 100644
index 96c9d49..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_small_labels.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_small_place.png b/app/src/main/res/drawable-hdpi/ic_small_place.png
deleted file mode 100644
index 6c7fbc9..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_small_place.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_small_time.png b/app/src/main/res/drawable-hdpi/ic_small_time.png
deleted file mode 100644
index dd1b7c1..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_small_time.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_access_time_grey600_18dp.png b/app/src/main/res/drawable-mdpi/ic_access_time_grey600_18dp.png
new file mode 100644
index 0000000..78aaa0e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_access_time_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_offer_black_18dp.png b/app/src/main/res/drawable-mdpi/ic_local_offer_black_18dp.png
new file mode 100644
index 0000000..47a109c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_local_offer_black_18dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_local_offer_grey600_18dp.png b/app/src/main/res/drawable-mdpi/ic_local_offer_grey600_18dp.png
new file mode 100644
index 0000000..d880333
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_local_offer_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_place_grey600_18dp.png b/app/src/main/res/drawable-mdpi/ic_place_grey600_18dp.png
new file mode 100644
index 0000000..1d07f01
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_place_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_access_time_grey600_18dp.png b/app/src/main/res/drawable-xhdpi/ic_access_time_grey600_18dp.png
new file mode 100644
index 0000000..b2aeafc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_access_time_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_offer_black_18dp.png b/app/src/main/res/drawable-xhdpi/ic_local_offer_black_18dp.png
new file mode 100644
index 0000000..0cd1ab0
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_local_offer_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_local_offer_grey600_18dp.png b/app/src/main/res/drawable-xhdpi/ic_local_offer_grey600_18dp.png
new file mode 100644
index 0000000..694e7f1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_local_offer_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_place_grey600_18dp.png b/app/src/main/res/drawable-xhdpi/ic_place_grey600_18dp.png
new file mode 100644
index 0000000..cde6394
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_place_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_small_labels.png b/app/src/main/res/drawable-xhdpi/ic_small_labels.png
deleted file mode 100644
index 36ccbcb..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_small_labels.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_small_place.png b/app/src/main/res/drawable-xhdpi/ic_small_place.png
deleted file mode 100644
index 4b3a5fe..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_small_place.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_small_time.png b/app/src/main/res/drawable-xhdpi/ic_small_time.png
deleted file mode 100644
index db57b30..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_small_time.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_access_time_grey600_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_access_time_grey600_18dp.png
new file mode 100644
index 0000000..b67923e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_access_time_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_offer_black_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_local_offer_black_18dp.png
new file mode 100644
index 0000000..3fc16b6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_local_offer_black_18dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_offer_grey600_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_local_offer_grey600_18dp.png
new file mode 100644
index 0000000..723fea2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_local_offer_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_place_grey600_18dp.png b/app/src/main/res/drawable-xxhdpi/ic_place_grey600_18dp.png
new file mode 100644
index 0000000..dbab37e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_place_grey600_18dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_small_labels.png b/app/src/main/res/drawable-xxhdpi/ic_small_labels.png
deleted file mode 100644
index 4aa9a29..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_small_labels.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_small_place.png b/app/src/main/res/drawable-xxhdpi/ic_small_place.png
deleted file mode 100644
index 4eda585..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_small_place.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_small_time.png b/app/src/main/res/drawable-xxhdpi/ic_small_time.png
deleted file mode 100644
index f21427e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_small_time.png and /dev/null differ
diff --git a/app/src/main/res/layout/fragment_event_details.xml b/app/src/main/res/layout/fragment_event_details.xml
index e1ef76c..9ba55cb 100644
--- a/app/src/main/res/layout/fragment_event_details.xml
+++ b/app/src/main/res/layout/fragment_event_details.xml
@@ -39,24 +39,17 @@
                 android:layout_marginTop="8dp"
                 tools:text="FOSDEM Staff"/>
 
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            android:orientation="vertical"
-            android:paddingBottom="8dp"
-            android:paddingLeft="@dimen/content_margin"
-            android:paddingRight="@dimen/content_margin"
-            android:paddingTop="8dp">
+            <View
+                style="@style/SeparatorLine"
+                android:layout_marginTop="8dp"/>
 
             <TextView
                 android:id="@+id/track"
                 style="@style/Metadata"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_small_labels"
+                android:layout_marginTop="8dp"
+                android:drawableLeft="@drawable/ic_local_offer_grey600_18dp"
                 tools:text="Keynotes"/>
 
             <TextView
@@ -64,7 +57,7 @@
                 style="@style/Metadata"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_small_time"
+                android:drawableLeft="@drawable/ic_access_time_grey600_18dp"
                 tools:text="Day 1 (Saturday), 09:30 - 09:55"/>
 
             <TextView
@@ -72,8 +65,9 @@
                 style="@style/Metadata.Selectable"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/ic_small_place"
+                android:drawableLeft="@drawable/ic_place_grey600_18dp"
                 tools:text="Janson (Building J)"/>
+
         </LinearLayout>
 
         <TextView
@@ -109,8 +103,6 @@
             <TextView
                 style="@style/Header"
                 android:text="@string/related_links_header"/>
-
-            <View style="@style/HeaderLine"/>
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/header_person_info.xml b/app/src/main/res/layout/header_person_info.xml
index 658d77a..97195af 100644
--- a/app/src/main/res/layout/header_person_info.xml
+++ b/app/src/main/res/layout/header_person_info.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
-
-    <TextView
-        style="@style/Header"
-        android:text="@string/talks_header"/>
-
-    <View style="@style/HeaderLine"/>
-
-</LinearLayout>
\ No newline at end of file
+<TextView
+    style="@style/Header"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:text="@string/talks_header"/>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 83a0464..812ec99 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -14,13 +14,4 @@
         <item name="android:textColorLink">?android:attr/colorAccent</item>
     </style>
 
-    <!-- Styles -->
-
-    <style name="Metadata.Selectable">
-        <!-- Invert colors at theme level to allow using the white ripple selector -->
-        <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be9d8e5..ca64766 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,7 @@
     <string name="settings_notifications_delay_summary">Delay before getting notified of an upcoming bookmarked event</string>
 
     <!-- Event details -->
-    <string name="related_links_header">RELATED LINKS</string>
+    <string name="related_links_header">Related Links</string>
     <string name="add_bookmark">Add to bookmarks</string>
     <string name="remove_bookmark">Remove from bookmarks</string>
     <string name="share">Share</string>
@@ -101,7 +101,7 @@
     </plurals>
 
     <!-- Speaker info -->
-    <string name="talks_header">TALKS</string>
+    <string name="talks_header">Talks</string>
     <string name="more_info">More info</string>
 
     <!-- Others -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a235cf1..d13828b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -67,32 +67,30 @@
         <item name="textColor">@color/tab_text</item>
     </style>
 
-    <style name="Metadata" parent="TextAppearance.AppCompat.Body1">
-        <item name="android:textColor">?android:textColorPrimaryInverse</item>
+    <style name="SeparatorLine">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/translucent_grey</item>
+    </style>
+
+    <style name="Metadata" parent="TextAppearance.AppCompat.Subhead">
+        <item name="android:textColor">#666666</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:drawablePadding">8dp</item>
     </style>
 
     <style name="Metadata.Selectable">
-        <item name="android:background">@drawable/abc_item_background_holo_dark</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
     </style>
 
     <style name="Header">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">5dp</item>
-        <item name="android:paddingLeft">@dimen/list_item_padding</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:textSize">20sp</item>
         <item name="android:textColor">@color/fosdem_purple</item>
     </style>
 
-    <style name="HeaderLine">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">2dp</item>
-        <item name="android:background">@color/fosdem_purple</item>
-    </style>
-
     <style name="RoomImageDialogAnimations">
         <item name="android:windowEnterAnimation">@anim/zoom_in</item>
         <item name="android:windowExitAnimation">@anim/zoom_out</item>