diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
index c9ebb69af..e2ad884f6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java
@@ -24,6 +24,7 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.widget.LinearLayoutManager;
@@ -259,9 +260,21 @@ public abstract class AbstractAppManagerFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
+        final FloatingActionButton appListFab = ((FloatingActionButton) getActivity().findViewById(R.id.fab));
         View rootView = inflater.inflate(R.layout.activity_appmanager, container, false);
 
         RecyclerView appListView = (RecyclerView) (rootView.findViewById(R.id.appListView));
+
+        appListView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                if (dy > 0) {
+                    appListFab.hide();
+                } else if (dy < 0) {
+                    appListFab.show();
+                }
+            }
+        });
         appListView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mGBDeviceAppAdapter = new GBDeviceAppAdapter(appList, R.layout.item_with_details_and_drag_handle, this);
         appListView.setAdapter(mGBDeviceAppAdapter);
diff --git a/app/src/main/res/layout/activity_appmanager.xml b/app/src/main/res/layout/activity_appmanager.xml
index ed6a70f38..943de9d83 100644
--- a/app/src/main/res/layout/activity_appmanager.xml
+++ b/app/src/main/res/layout/activity_appmanager.xml
@@ -5,7 +5,10 @@
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.appmanager.AbstractAppManagerFragment">
 
     <android.support.v7.widget.RecyclerView
-            android:id="@+id/appListView"
-            android:layout_width="match_parent"
-        android:layout_height="fill_parent" />
+        android:id="@+id/appListView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:divider="@null" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_fragmentappmanager.xml b/app/src/main/res/layout/activity_fragmentappmanager.xml
index d32ada664..95915b0a6 100644
--- a/app/src/main/res/layout/activity_fragmentappmanager.xml
+++ b/app/src/main/res/layout/activity_fragmentappmanager.xml
@@ -3,10 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingBottom="0px"
-    android:paddingLeft="0px"
-    android:paddingRight="0px"
-    android:paddingTop="0px"
     tools:context=".activities.appmanager.AppManagerActivity">
 
     <LinearLayout
@@ -21,11 +17,11 @@
             android:layout_height="match_parent"
             tools:context=".activities.appmanager.AppManagerActivity">
 
-            <android.support.v4.view.PagerTabStrip
+            <android.support.design.widget.TabLayout
                 android:id="@+id/charts_pagerTabStrip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom" />
+                android:layout_gravity="top" />
         </android.support.v4.view.ViewPager>
 
     </LinearLayout>
@@ -39,7 +35,7 @@
         android:src="@drawable/ic_add_white"
         app:elevation="6dp"
         app:pressedTranslationZ="12dp"
-        android:layout_marginBottom="10dp"
-        android:layout_marginRight="10dp" />
+        android:layout_marginBottom="30dp"
+        android:layout_marginEnd="10dp" />
 
 </android.widget.RelativeLayout>
diff --git a/app/src/main/res/layout/item_with_details_and_drag_handle.xml b/app/src/main/res/layout/item_with_details_and_drag_handle.xml
index 98d39a23f..316fc03a6 100644
--- a/app/src/main/res/layout/item_with_details_and_drag_handle.xml
+++ b/app/src/main/res/layout/item_with_details_and_drag_handle.xml
@@ -4,50 +4,60 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/activatedBackgroundIndicator"
-    android:padding="8dp">
+    android:minHeight="60dp">
 
     <ImageView
         android:id="@+id/item_image"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_alignParentStart="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_centerVertical="true"
         android:contentDescription="@string/candidate_item_device_image" />
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignWithParentIfMissing="true"
         android:layout_centerVertical="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
         android:layout_toEndOf="@+id/item_image"
         android:layout_toStartOf="@+id/drag_handle"
         android:orientation="vertical"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp">
+        android:paddingBottom="8dp"
+        android:paddingTop="8dp">
 
         <TextView
             android:id="@+id/item_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:maxLines="1"
             android:scrollHorizontally="false"
-            style="@style/Base.TextAppearance.AppCompat.SearchResult.Title"
             android:text="Item Name"
-            android:maxLines="1" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
         <TextView
             android:id="@+id/item_details"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/Base.TextAppearance.AppCompat.SearchResult"
-            android:text="Item Description" />
+            android:text="Item Description"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
     </LinearLayout>
 
 
     <ImageView
         android:id="@+id/drag_handle"
-        android:tint="@color/secondarytext"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
         android:layout_alignParentEnd="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_centerVertical="true"
         android:contentDescription="drag handle"
+        android:tint="@color/secondarytext"
         app:srcCompat="@drawable/ic_drag_handle_black_24dp" />
 
 </RelativeLayout>
\ No newline at end of file