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
@@ -1,181 +1,180 @@
 /*
  * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.kde.kdeconnect.Plugins.SharePlugin;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.UserInterface.List.EntryItem;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
 import org.kde.kdeconnect.UserInterface.ThemeUtil;
 import org.kde.kdeconnect_tp.R;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
 
 public class ShareActivity extends AppCompatActivity {
 
     private SwipeRefreshLayout mSwipeRefreshLayout;
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.refresh, menu);
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_refresh:
                 updateComputerListAction();
                 break;
             default:
                 break;
         }
         return true;
     }
 
     private void updateComputerListAction() {
         updateComputerList();
         BackgroundService.RunCommand(ShareActivity.this, BackgroundService::onNetworkChange);
 
         mSwipeRefreshLayout.setRefreshing(true);
         new Thread(() -> {
             try {
                 Thread.sleep(1500);
             } catch (InterruptedException ignored) {
             }
             runOnUiThread(() -> mSwipeRefreshLayout.setRefreshing(false));
         }).start();
     }
 
     private void updateComputerList() {
 
         final Intent intent = getIntent();
 
         String action = intent.getAction();
         if (!Intent.ACTION_SEND.equals(action) && !Intent.ACTION_SEND_MULTIPLE.equals(action)) {
             finish();
             return;
         }
 
         BackgroundService.RunCommand(this, service -> {
 
             Collection<Device> devices = service.getDevices().values();
             final ArrayList<Device> devicesList = new ArrayList<>();
             final ArrayList<ListAdapter.Item> items = new ArrayList<>();
 
             SectionItem section = new SectionItem(getString(R.string.share_to));
             items.add(section);
 
             for (Device d : devices) {
                 if (d.isReachable() && d.isPaired()) {
                     devicesList.add(d);
                     items.add(new EntryItem(d.getName()));
                     section.isEmpty = false;
                 }
             }
 
             runOnUiThread(() -> {
                 ListView list = (ListView) findViewById(R.id.devices_list);
                 list.setAdapter(new ListAdapter(ShareActivity.this, items));
                 list.setOnItemClickListener((adapterView, view, i, l) -> {
 
                     Device device = devicesList.get(i - 1); //NOTE: -1 because of the title!
                     SharePlugin.share(intent, device);
                     finish();
                 });
             });
 
         });
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         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);
         mSwipeRefreshLayout.setOnRefreshListener(
                 this::updateComputerListAction
         );
         if (actionBar != null) {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
         }
     }
 
 
     @Override
     protected void onStart() {
         super.onStart();
 
         final Intent intent = getIntent();
         final String deviceId = intent.getStringExtra("deviceId");
 
         if (deviceId != null) {
 
             BackgroundService.RunCommand(this, service -> {
                 Log.d("DirectShare", "sharing to " + service.getDevice(deviceId).getName());
                 Device device = service.getDevice(deviceId);
                 if (device.isReachable() && device.isPaired()) {
                     SharePlugin.share(intent, device);
                 }
                 finish();
             });
         } else {
 
             BackgroundService.addGuiInUseCounter(this);
             BackgroundService.RunCommand(this, service -> {
                 service.onNetworkChange();
                 service.addDeviceListChangedCallback("ShareActivity", this::updateComputerList);
             });
             updateComputerList();
         }
     }
 
 
     @Override
     protected void onStop() {
         BackgroundService.RunCommand(this, service -> service.removeDeviceListChangedCallback("ShareActivity"));
         BackgroundService.removeGuiInUseCounter(this);
         super.onStop();
     }
 
 }
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
@@ -1,253 +1,253 @@
 /*
  * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.kde.kdeconnect.UserInterface;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.PairingDeviceItem;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
 import org.kde.kdeconnect_tp.R;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
 
 /**
  * The view that the user will see when there are no devices paired, or when you choose "add a new device" from the sidebar.
  */
 
 public class PairingFragment extends Fragment implements PairingDeviceItem.Callback {
 
     private static final int RESULT_PAIRING_SUCCESFUL = Activity.RESULT_FIRST_USER;
 
     private View rootView;
     private SwipeRefreshLayout mSwipeRefreshLayout;
     private MainActivity mActivity;
 
     boolean listRefreshCalledThisFrame = false;
 
     TextView headerText;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         //Log.e("PairingFragmen", "OnCreateView");
 
         mActivity.getSupportActionBar().setTitle(R.string.pairing_title);
 
 
         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(
                 this::updateComputerListAction
         );
         headerText = new TextView(inflater.getContext());
         headerText.setText(getString(R.string.pairing_description));
         headerText.setPadding(0, (int) (16 * getResources().getDisplayMetrics().density), 0, (int) (12 * getResources().getDisplayMetrics().density));
         ((ListView) listRootView).addHeaderView(headerText);
 
         return rootView;
     }
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         mActivity = ((MainActivity) getActivity());
     }
 
     private void updateComputerListAction() {
         updateComputerList();
         BackgroundService.RunCommand(mActivity, BackgroundService::onNetworkChange);
         mSwipeRefreshLayout.setRefreshing(true);
         new Thread(() -> {
             try {
                 Thread.sleep(1500);
             } catch (InterruptedException ignored) {
             }
             mActivity.runOnUiThread(() -> mSwipeRefreshLayout.setRefreshing(false));
         }).start();
     }
 
     private void updateComputerList() {
         BackgroundService.RunCommand(mActivity, service -> mActivity.runOnUiThread(() -> {
 
             if (!isAdded()) {
                 //Fragment is not attached to an activity. We will crash if we try to do anything here.
                 return;
             }
 
             if (listRefreshCalledThisFrame) {
                 // This makes sure we don't try to call list.getFirstVisiblePosition()
                 // twice per frame, because the second time the list hasn't been drawn
                 // yet and it would always return 0.
                 return;
             }
             listRefreshCalledThisFrame = true;
 
             headerText.setText(getString(NetworkHelper.isOnMobileNetwork(getContext()) ? R.string.on_data_message : R.string.pairing_description));
             //Disable tap animation
             headerText.setOnClickListener(null);
             headerText.setOnLongClickListener(null);
 
             try {
                 Collection<Device> devices = service.getDevices().values();
                 final ArrayList<ListAdapter.Item> items = new ArrayList<>();
 
                 SectionItem connectedSection;
                 Resources res = getResources();
 
                 connectedSection = new SectionItem(res.getString(R.string.category_connected_devices));
                 items.add(connectedSection);
                 for (Device device : devices) {
                     if (device.isReachable() && device.isPaired()) {
                         items.add(new PairingDeviceItem(device, PairingFragment.this));
                         connectedSection.isEmpty = false;
                     }
                 }
                 if (connectedSection.isEmpty) {
                     items.remove(items.size() - 1); //Remove connected devices section if empty
                 }
 
                 SectionItem availableSection = new SectionItem(res.getString(R.string.category_not_paired_devices));
                 items.add(availableSection);
                 for (Device device : devices) {
                     if (device.isReachable() && !device.isPaired()) {
                         items.add(new PairingDeviceItem(device, PairingFragment.this));
                         availableSection.isEmpty = false;
                     }
                 }
                 if (availableSection.isEmpty && !connectedSection.isEmpty) {
                     items.remove(items.size() - 1); //Remove remembered devices section if empty
                 }
 
                 SectionItem rememberedSection = new SectionItem(res.getString(R.string.category_remembered_devices));
                 items.add(rememberedSection);
                 for (Device device : devices) {
                     if (!device.isReachable() && device.isPaired()) {
                         items.add(new PairingDeviceItem(device, PairingFragment.this));
                         rememberedSection.isEmpty = false;
                     }
                 }
                 if (rememberedSection.isEmpty) {
                     items.remove(items.size() - 1); //Remove remembered devices section if empty
                 }
 
                 final ListView list = (ListView) rootView.findViewById(R.id.devices_list);
 
                 //Store current scroll
                 int index = list.getFirstVisiblePosition();
                 View v = list.getChildAt(0);
                 int top = (v == null) ? 0 : (v.getTop() - list.getPaddingTop());
 
                 list.setAdapter(new ListAdapter(mActivity, items));
 
                 //Restore scroll
                 list.setSelectionFromTop(index, top);
             } catch (IllegalStateException e) {
                 e.printStackTrace();
                 //Ignore: The activity was closed while we were trying to update it
             } finally {
                 listRefreshCalledThisFrame = false;
             }
 
     }));
 }
 
     @Override
     public void onStart() {
         super.onStart();
         BackgroundService.RunCommand(mActivity, service -> service.addDeviceListChangedCallback("PairingFragment", this::updateComputerList));
         updateComputerList();
     }
 
     @Override
     public void onStop() {
         super.onStop();
         mSwipeRefreshLayout.setEnabled(false);
         BackgroundService.RunCommand(mActivity, service -> service.removeDeviceListChangedCallback("PairingFragment"));
     }
 
     @Override
     public void pairingClicked(Device device) {
         mActivity.onDeviceSelected(device.getDeviceId(), !device.isPaired() || !device.isReachable());
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case RESULT_PAIRING_SUCCESFUL:
                 if (resultCode == 1) {
                     String deviceId = data.getStringExtra("deviceId");
                     mActivity.onDeviceSelected(deviceId);
                 }
                 break;
             default:
                 super.onActivityResult(requestCode, resultCode, data);
         }
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.pairing, menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_refresh:
                 updateComputerListAction();
                 break;
             case R.id.menu_rename:
                 mActivity.renameDevice();
                 break;
             case R.id.menu_custom_device_list:
                 startActivity(new Intent(mActivity, CustomDevicesActivity.class));
                 break;
             default:
                 break;
         }
         return true;
     }
 
 
 }