diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 809241a..f7f77da 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
             android:name=".activities.MainActivity"
diff --git a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
index 4872459..22fea1f 100644
--- a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
+++ b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
@@ -28,6 +28,7 @@ import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v4.widget.DrawerLayout;
+import android.support.v4.widget.TextViewCompat;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -483,7 +484,7 @@ public class MainActivity extends AppCompatActivity implements Handler.Callback
 				sectionIcon.mutate().setColorFilter(currentSectionForegroundColor, PorterDuff.Mode.SRC_IN);
 			}
 			tv.setText(sectionTitle);
-			tv.setCompoundDrawablesWithIntrinsicBounds(sectionIcon, null, null, null);
+			TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(tv, sectionIcon, null, null, null);
 
 			return convertView;
 		}
diff --git a/app/src/main/res/layout-sw600dp-land/track_schedule.xml b/app/src/main/res/layout-sw600dp-land/track_schedule.xml
index f4c26e8..5d495c5 100644
--- a/app/src/main/res/layout-sw600dp-land/track_schedule.xml
+++ b/app/src/main/res/layout-sw600dp-land/track_schedule.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:app="http://schemas.android.com/apk/res-auto"
+             xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
-             android:layout_height="match_parent">
+             android:layout_height="match_parent"
+             tools:context=".activities.TrackScheduleActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,7 +23,7 @@
             android:id="@+id/schedule"
             android:layout_width="@dimen/schedule_column_width"
             android:layout_height="0dp"
-            android:layout_gravity="left"
+            android:layout_gravity="start"
             android:layout_weight="1"/>
     </LinearLayout>
 
@@ -30,15 +32,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/detail_card_view_margin_bottom"
-        android:layout_marginLeft="@dimen/detail_card_view_margin_left"
-        android:layout_marginRight="@dimen/detail_card_view_margin_right"
+        android:layout_marginEnd="@dimen/detail_card_view_margin_end"
+        android:layout_marginLeft="@dimen/detail_card_view_margin_start"
+        android:layout_marginRight="@dimen/detail_card_view_margin_end"
+        android:layout_marginStart="@dimen/detail_card_view_margin_start"
         android:layout_marginTop="@dimen/detail_card_view_margin_top"
         app:cardElevation="@dimen/detail_card_view_elevation"/>
 
     <ImageView
         android:id="@+id/fab"
         style="@style/FloatingActionButton"
-        android:layout_gravity="top|right"
+        android:layout_gravity="top|end"
+        android:layout_marginEnd="20dp"
         android:layout_marginRight="20dp"
         android:layout_marginTop="100dp"
         android:src="@drawable/ic_bookmark_outline_white_24dp"/>
diff --git a/app/src/main/res/layout/content_extended_title.xml b/app/src/main/res/layout/content_extended_title.xml
index c6458ea..538f2e9 100644
--- a/app/src/main/res/layout/content_extended_title.xml
+++ b/app/src/main/res/layout/content_extended_title.xml
@@ -3,7 +3,8 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:orientation="vertical">
+              android:orientation="vertical"
+              tools:context=".activities.PersonInfoActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_event_details.xml b/app/src/main/res/layout/fragment_event_details.xml
index 9ba55cb..c59c41f 100644
--- a/app/src/main/res/layout/fragment_event_details.xml
+++ b/app/src/main/res/layout/fragment_event_details.xml
@@ -2,7 +2,8 @@
 <ScrollView 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:layout_height="match_parent"
+            tools:context=".activities.EventDetailsActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -50,6 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:drawableLeft="@drawable/ic_local_offer_grey600_18dp"
+                android:drawableStart="@drawable/ic_local_offer_grey600_18dp"
                 tools:text="Keynotes"/>
 
             <TextView
@@ -58,6 +60,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/ic_access_time_grey600_18dp"
+                android:drawableStart="@drawable/ic_access_time_grey600_18dp"
                 tools:text="Day 1 (Saturday), 09:30 - 09:55"/>
 
             <TextView
@@ -66,6 +69,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/ic_place_grey600_18dp"
+                android:drawableStart="@drawable/ic_place_grey600_18dp"
                 tools:text="Janson (Building J)"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/track_schedule.xml b/app/src/main/res/layout/track_schedule.xml
index 1f651f1..c4fd383 100644
--- a/app/src/main/res/layout/track_schedule.xml
+++ b/app/src/main/res/layout/track_schedule.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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:orientation="vertical">
+              android:orientation="vertical"
+              tools:context=".activities.TrackScheduleActivity">
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
@@ -16,4 +18,5 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
index 45414f1..b2b44cd 100644
--- a/app/src/main/res/values-v21/dimens.xml
+++ b/app/src/main/res/values-v21/dimens.xml
@@ -2,8 +2,8 @@
 <resources>
 
     <!-- Use original values for native card view elevation -->
-    <dimen name="detail_card_view_margin_left">@dimen/schedule_column_width</dimen>
-    <dimen name="detail_card_view_margin_right">96dp</dimen>
+    <dimen name="detail_card_view_margin_start">@dimen/schedule_column_width</dimen>
+    <dimen name="detail_card_view_margin_end">96dp</dimen>
     <dimen name="detail_card_view_margin_top">64dp</dimen>
     <dimen name="detail_card_view_margin_bottom">0dp</dimen>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 7eff4d7..0fb6171 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,8 +14,8 @@
     <dimen name="detail_card_view_elevation">6dp</dimen>
     <!-- Enlarge the card view by 7dp left & right and 10dp top & bottom
         to compensate for the compatibility padding of the 6dp elevation -->
-    <dimen name="detail_card_view_margin_left">353dp</dimen>
-    <dimen name="detail_card_view_margin_right">89dp</dimen>
+    <dimen name="detail_card_view_margin_start">353dp</dimen>
+    <dimen name="detail_card_view_margin_end">89dp</dimen>
     <dimen name="detail_card_view_margin_top">54dp</dimen>
     <dimen name="detail_card_view_margin_bottom">-10dp</dimen>
     <dimen name="fab_diameter">56dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 84d3c1e..e2cbf24 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Main theme -->
 
@@ -70,8 +70,9 @@
         <item name="android:focusable">true</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/main_menu_item_height</item>
-        <item name="android:gravity">left|center_vertical</item>
+        <item name="android:gravity">start|center_vertical</item>
         <item name="android:paddingLeft">@dimen/main_menu_padding</item>
+        <item name="android:paddingStart" tools:ignore="NewApi">@dimen/main_menu_padding</item>
         <item name="android:drawablePadding">@dimen/main_menu_drawable_padding</item>
     </style>