diff --git a/res/layout/activity_device.xml b/res/layout/activity_device.xml
index 43028053..2e40c2d9 100644
--- a/res/layout/activity_device.xml
+++ b/res/layout/activity_device.xml
@@ -1,106 +1,106 @@
 <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:padding="@dimen/activity_vertical_margin"
-    tools:context=".DeviceFragment"
+    tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment"
     android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:id="@+id/pairing_buttons"
         android:layout_gravity="center">
 
         <ProgressBar
             android:visibility="gone"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/pair_progress" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/device_not_paired"
             android:id="@+id/pair_message"
         />
 
         <Button
             android:id="@+id/pair_button"
             android:background="@drawable/button_round"
             android:textColor="@android:color/white"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/request_pairing"
         />
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
             android:id="@+id/pair_request"
             android:layout_gravity="center">
 
             <Button
                 android:background="@drawable/button_round"
                 android:textColor="@android:color/white"
                 android:layout_margin="4dip"
                 android:id="@+id/accept_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/pairing_accept"
                 android:layout_weight="1"
             />
 
             <Button
                 android:background="@drawable/button_round"
                 android:textColor="@android:color/white"
                 android:layout_margin="4dip"
                 android:id="@+id/reject_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/pairing_reject"
                 android:layout_weight="1" />
 
         </LinearLayout>
     </LinearLayout>
 
     <TextView
         android:id="@+id/not_reachable_message"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:drawableStart="@drawable/ic_error_outline_black_48dp"
         android:drawableLeft="@drawable/ic_error_outline_black_48dp"
         android:drawablePadding="8dip"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:text="@string/unreachable_description"
         android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
     <TextView
         android:id="@+id/on_data_message"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:drawableStart="@drawable/ic_error_outline_black_48dp"
         android:drawableLeft="@drawable/ic_error_outline_black_48dp"
         android:drawablePadding="8dip"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:text="@string/on_data_message"
         android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
     <ListView
         android:id="@+id/buttons_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
         tools:context=".DeviceActivity"
         />
 
 </LinearLayout>
diff --git a/res/layout/activity_list.xml b/res/layout/activity_list.xml
index 88188a28..97065f2b 100644
--- a/res/layout/activity_list.xml
+++ b/res/layout/activity_list.xml
@@ -1,11 +1,11 @@
 <ListView 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:paddingLeft="16dip"
     android:paddingRight="16dip"
-    tools:context=".MainActivity"
+    tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity"
     android:id="@+id/listView1"
     android:addStatesFromChildren="true"
     android:orientation="vertical">
 </ListView>