diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
index 1577ce42..584ac07d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ConfigureAlarms.java
@@ -19,8 +19,9 @@ package nodomain.freeyourgadget.gadgetbridge.activities;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.view.MenuItem;
-import android.widget.ListView;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -64,8 +65,10 @@ public class ConfigureAlarms extends GBActivity {
 
         mGBAlarmListAdapter = new GBAlarmListAdapter(this, preferencesAlarmListSet);
 
-        ListView listView = (ListView) findViewById(R.id.alarm_list);
-        listView.setAdapter(mGBAlarmListAdapter);
+        RecyclerView alarmsRecyclerView = (RecyclerView) findViewById(R.id.alarm_list);
+        alarmsRecyclerView.setHasFixedSize(true);
+        alarmsRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        alarmsRecyclerView.setAdapter(mGBAlarmListAdapter);
         updateAlarmsFromPrefs();
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
index 129033ec..a63606d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java
@@ -19,20 +19,21 @@ package nodomain.freeyourgadget.gadgetbridge.adapter;
 
 
 import android.content.Context;
-import android.graphics.Color;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
+import android.widget.CheckedTextView;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
-import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
 import nodomain.freeyourgadget.gadgetbridge.activities.ConfigureAlarms;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBAlarm;
@@ -41,22 +42,18 @@ import nodomain.freeyourgadget.gadgetbridge.model.Alarm;
 /**
  * Adapter for displaying GBAlarm instances.
  */
-public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
+public class GBAlarmListAdapter extends RecyclerView.Adapter<GBAlarmListAdapter.ViewHolder> {
 
 
     private final Context mContext;
-    private ArrayList<GBAlarm> alarmList;
-
-    public GBAlarmListAdapter(Context context, ArrayList<GBAlarm> alarmList) {
-        super(context, 0, alarmList);
+    private List<GBAlarm> alarmList;
 
+    public GBAlarmListAdapter(Context context, List<GBAlarm> alarmList) {
         this.mContext = context;
         this.alarmList = alarmList;
     }
 
     public GBAlarmListAdapter(Context context, Set<String> preferencesAlarmListSet) {
-        super(context, 0, new ArrayList<GBAlarm>());
-
         this.mContext = context;
         alarmList = new ArrayList<>();
 
@@ -81,7 +78,7 @@ public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
     }
 
     public ArrayList<? extends Alarm> getAlarmList() {
-        return alarmList;
+        return (ArrayList) alarmList;
     }
 
 
@@ -95,53 +92,26 @@ public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
     }
 
     @Override
-    public int getCount() {
-        if (alarmList != null) {
-            return alarmList.size();
-        }
-        return 0;
+    public GBAlarmListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.alarm_item, parent, false);
+        ViewHolder vh = new ViewHolder(view);
+        return vh;
     }
 
     @Override
-    public GBAlarm getItem(int position) {
-        if (alarmList != null) {
-            return alarmList.get(position);
-        }
-        return null;
-    }
+    public void onBindViewHolder(ViewHolder holder, final int position) {
 
-    @Override
-    public long getItemId(int position) {
-        if (alarmList != null) {
-            return alarmList.get(position).getIndex();
-        }
-        return 0;
-    }
+        final GBAlarm alarm = alarmList.get(position);
 
-    @Override
-    public View getView(int position, View view, ViewGroup parent) {
+        holder.alarmDayMonday.setChecked(alarm.getRepetition(Alarm.ALARM_MON));
+        holder.alarmDayTuesday.setChecked(alarm.getRepetition(Alarm.ALARM_TUE));
+        holder.alarmDayWednesday.setChecked(alarm.getRepetition(Alarm.ALARM_WED));
+        holder.alarmDayThursday.setChecked(alarm.getRepetition(Alarm.ALARM_THU));
+        holder.alarmDayFriday.setChecked(alarm.getRepetition(Alarm.ALARM_FRI));
+        holder.alarmDaySaturday.setChecked(alarm.getRepetition(Alarm.ALARM_SAT));
+        holder.alarmDaySunday.setChecked(alarm.getRepetition(Alarm.ALARM_SUN));
 
-        final GBAlarm alarm = getItem(position);
-
-        if (view == null) {
-            LayoutInflater inflater = (LayoutInflater) mContext
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            view = inflater.inflate(R.layout.alarm_item, parent, false);
-        }
-
-        TextView alarmTime = (TextView) view.findViewById(R.id.alarm_item_time);
-        Switch isEnabled = (Switch) view.findViewById(R.id.alarm_item_toggle);
-        TextView isSmartWakeup = (TextView) view.findViewById(R.id.alarm_smart_wakeup);
-
-        highlightDay((TextView) view.findViewById(R.id.alarm_item_sunday), alarm.getRepetition(Alarm.ALARM_SUN));
-        highlightDay((TextView) view.findViewById(R.id.alarm_item_monday), alarm.getRepetition(Alarm.ALARM_MON));
-        highlightDay((TextView) view.findViewById(R.id.alarm_item_tuesday), alarm.getRepetition(Alarm.ALARM_TUE));
-        highlightDay((TextView) view.findViewById(R.id.alarm_item_wednesday), alarm.getRepetition(Alarm.ALARM_WED));
-        highlightDay((TextView) view.findViewById(R.id.alarm_item_thursday), alarm.getRepetition(Alarm.ALARM_THU));
-        highlightDay((TextView) view.findViewById(R.id.alarm_item_friday), alarm.getRepetition(Alarm.ALARM_FRI));
-        highlightDay((TextView) view.findViewById(R.id.alarm_item_saturday), alarm.getRepetition(Alarm.ALARM_SAT));
-
-        isEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        holder.isEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 alarm.setEnabled(isChecked);
@@ -149,28 +119,62 @@ public class GBAlarmListAdapter extends ArrayAdapter<GBAlarm> {
             }
         });
 
-        view.setOnClickListener(new View.OnClickListener() {
+        holder.container.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 ((ConfigureAlarms) mContext).configureAlarm(alarm);
             }
         });
-        alarmTime.setText(alarm.getTime());
-        isEnabled.setChecked(alarm.isEnabled());
+        holder.alarmTime.setText(alarm.getTime());
+        holder.isEnabled.setChecked(alarm.isEnabled());
         if (alarm.isSmartWakeup()) {
-            isSmartWakeup.setVisibility(TextView.VISIBLE);
+            holder.isSmartWakeup.setVisibility(TextView.VISIBLE);
         } else {
-            isSmartWakeup.setVisibility(TextView.GONE);
-        }
-
-        return view;
-    }
-
-    private void highlightDay(TextView view, boolean isOn) {
-        if (isOn) {
-            view.setTextColor(Color.BLUE);
-        } else {
-            view.setTextColor(GBApplication.getTextColor(mContext));
+            holder.isSmartWakeup.setVisibility(TextView.GONE);
         }
     }
+
+
+    @Override
+    public int getItemCount() {
+        return alarmList.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+
+        CardView container;
+
+        TextView alarmTime;
+        Switch isEnabled;
+        TextView isSmartWakeup;
+
+        CheckedTextView alarmDayMonday;
+        CheckedTextView alarmDayTuesday;
+        CheckedTextView alarmDayWednesday;
+        CheckedTextView alarmDayThursday;
+        CheckedTextView alarmDayFriday;
+        CheckedTextView alarmDaySaturday;
+        CheckedTextView alarmDaySunday;
+
+        ViewHolder(View view) {
+            super(view);
+
+            container = (CardView) view.findViewById(R.id.card_view);
+
+            alarmTime = (TextView) view.findViewById(R.id.alarm_item_time);
+            isEnabled = (Switch) view.findViewById(R.id.alarm_item_toggle);
+            isSmartWakeup = (TextView) view.findViewById(R.id.alarm_smart_wakeup);
+
+            alarmDayMonday = (CheckedTextView) view.findViewById(R.id.alarm_item_monday);
+            alarmDayTuesday = (CheckedTextView) view.findViewById(R.id.alarm_item_tuesday);
+            alarmDayWednesday = (CheckedTextView) view.findViewById(R.id.alarm_item_wednesday);
+            alarmDayThursday = (CheckedTextView) view.findViewById(R.id.alarm_item_thursday);
+            alarmDayFriday = (CheckedTextView) view.findViewById(R.id.alarm_item_friday);
+            alarmDaySaturday = (CheckedTextView) view.findViewById(R.id.alarm_item_saturday);
+            alarmDaySunday = (CheckedTextView) view.findViewById(R.id.alarm_item_sunday);
+
+
+        }
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_configure_alarms.xml b/app/src/main/res/layout/activity_configure_alarms.xml
index 10cd04bd..fbcdf6c5 100644
--- a/app/src/main/res/layout/activity_configure_alarms.xml
+++ b/app/src/main/res/layout/activity_configure_alarms.xml
@@ -1,16 +1,17 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    android:fitsSystemWindows="true"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.ConfigureAlarms">
 
-    <ListView
-        android:descendantFocusability="blocksDescendants"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <android.support.v7.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:divider="@null"
         android:id="@+id/alarm_list" />
-</FrameLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/alarm_item.xml b/app/src/main/res/layout/alarm_item.xml
index a4d887fe..470abf95 100644
--- a/app/src/main/res/layout/alarm_item.xml
+++ b/app/src/main/res/layout/alarm_item.xml
@@ -1,110 +1,145 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
 
-    <RelativeLayout
+    <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/card_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp">
+        android:layout_margin="8dp"
+        android:foreground="?android:attr/selectableItemBackground"
+        card_view:cardCornerRadius="4dp"
+        card_view:cardElevation="4dp"
+        card_view:contentPadding="8dp">
 
-        <TextView
-            android:id="@+id/alarm_item_time"
-            android:layout_width="wrap_content"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:text="00:00"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:layout_margin="16dp">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="(Smart)"
-            android:layout_toRightOf="@+id/alarm_item_time"
-            android:id="@+id/alarm_smart_wakeup"
-            android:visibility="invisible"
-            android:layout_alignBaseline="@+id/alarm_item_time" />
+            <TextView
+                android:id="@+id/alarm_item_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_margin="8dp"
+                android:text="00:00"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
-        <TextView
-            android:id="@+id/alarm_item_monday"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@+id/alarm_item_time"
-            android:layout_marginLeft="4dp"
-            android:text="@string/alarm_mon_short"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            <TextView
+                android:id="@+id/alarm_smart_wakeup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBaseline="@+id/alarm_item_time"
+                android:layout_toEndOf="@+id/alarm_item_time"
+                android:text="(Smart)"
+                android:visibility="invisible" />
 
-        <TextView
-            android:id="@+id/alarm_item_tuesday"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/alarm_item_monday"
-            android:layout_below="@+id/alarm_item_time"
-            android:layout_marginLeft="4dp"
-            android:text="@string/alarm_tue_short"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            <Switch
+                android:id="@+id/alarm_item_toggle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_alignParentTop="true" />
 
-        <TextView
-            android:id="@+id/alarm_item_wednesday"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/alarm_item_tuesday"
-            android:layout_below="@+id/alarm_item_time"
-            android:layout_marginLeft="4dp"
-            android:text="@string/alarm_wed_short"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            <LinearLayout
+                android:id="@+id/dowSelector"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/alarm_item_time"
+                android:baselineAligned="false"
+                android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/alarm_item_thursday"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/alarm_item_wednesday"
-            android:layout_below="@+id/alarm_item_time"
-            android:layout_marginLeft="4dp"
-            android:text="@string/alarm_thu_short"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+                <android.support.v7.widget.AppCompatCheckedTextView
+                    android:id="@+id/alarm_item_monday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_weight="1"
+                    android:checked="false"
+                    android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
+                    android:gravity="center"
+                    android:text="@string/alarm_mon_short"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <TextView
-            android:id="@+id/alarm_item_friday"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/alarm_item_thursday"
-            android:layout_below="@+id/alarm_item_time"
-            android:layout_marginLeft="4dp"
-            android:text="@string/alarm_fri_short"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+                <android.support.v7.widget.AppCompatCheckedTextView
+                    android:id="@+id/alarm_item_tuesday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_weight="1"
+                    android:checked="false"
+                    android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
+                    android:gravity="center"
+                    android:text="@string/alarm_tue_short"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <TextView
-            android:id="@+id/alarm_item_saturday"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/alarm_item_friday"
-            android:layout_below="@+id/alarm_item_time"
-            android:layout_marginLeft="4dp"
-            android:text="@string/alarm_sat_short"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+                <android.support.v7.widget.AppCompatCheckedTextView
+                    android:id="@+id/alarm_item_wednesday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_weight="1"
+                    android:checked="false"
+                    android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
+                    android:gravity="center"
+                    android:text="@string/alarm_wed_short"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <TextView
-            android:id="@+id/alarm_item_sunday"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/alarm_item_saturday"
-            android:layout_below="@+id/alarm_item_time"
-            android:layout_marginLeft="4dp"
-            android:text="@string/alarm_sun_short"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+                <android.support.v7.widget.AppCompatCheckedTextView
+                    android:id="@+id/alarm_item_thursday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_weight="1"
+                    android:checked="false"
+                    android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
+                    android:gravity="center"
+                    android:text="@string/alarm_thu_short"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
-        <Switch
-            android:id="@+id/alarm_item_toggle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true" />
+                <android.support.v7.widget.AppCompatCheckedTextView
+                    android:id="@+id/alarm_item_friday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_weight="1"
+                    android:checked="false"
+                    android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
+                    android:gravity="center"
+                    android:text="@string/alarm_fri_short"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
-    </RelativeLayout>
+                <android.support.v7.widget.AppCompatCheckedTextView
+                    android:id="@+id/alarm_item_saturday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_weight="1"
+                    android:checked="false"
+                    android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
+                    android:gravity="center"
+                    android:text="@string/alarm_sat_short"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
+                <android.support.v7.widget.AppCompatCheckedTextView
+                    android:id="@+id/alarm_item_sunday"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:layout_weight="1"
+                    android:checked="false"
+                    android:drawableTop="?android:attr/listChoiceIndicatorMultiple"
+                    android:gravity="center"
+                    android:text="@string/alarm_sun_short"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
 
-</FrameLayout>
\ No newline at end of file
+            </LinearLayout>
+
+        </RelativeLayout>
+    </android.support.v7.widget.CardView>
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file