diff --git a/res/layout/activity_list.xml b/res/layout/activity_list.xml
new file mode 100644
index 00000000..ab989ad8
--- /dev/null
+++ b/res/layout/activity_list.xml
@@ -0,0 +1,10 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/devices_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:addStatesFromChildren="true"
+    android:orientation="vertical"
+    android:paddingLeft="16dip"
+    android:paddingRight="16dip"
+    tools:context="org.kde.kdeconnect.UserInterface.MainActivity" />
diff --git a/res/layout/fragment_pair.xml b/res/layout/fragment_pair.xml
new file mode 100644
index 00000000..d2f33575
--- /dev/null
+++ b/res/layout/fragment_pair.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/refresh_list_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/devices_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:addStatesFromChildren="true"
+        android:orientation="vertical"
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip"
+        tools:context=".MainActivity" />
+
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
index b6505d12..ade3d02f 100644
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
@@ -128,8 +128,7 @@ public class ShareActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         ThemeUtil.setUserPreferredTheme(this);
-        setContentView(R.layout.devices_list);
-
+        setContentView(R.layout.fragment_pair);
 
         ActionBar actionBar = getSupportActionBar();
         mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.refresh_list_layout);
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
index 4c3112fe..60c3d6f6 100644
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -75,7 +75,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
 
         setHasOptionsMenu(true);
 
-        rootView = inflater.inflate(R.layout.devices_list, container, false);
+        rootView = inflater.inflate(R.layout.fragment_pair, container, false);
         View listRootView = rootView.findViewById(R.id.devices_list);
         mSwipeRefreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.refresh_list_layout);
         mSwipeRefreshLayout.setOnRefreshListener(