diff --git a/CHANGELOG.md b/CHANGELOG.md
index 767e9ac49..b3a95f41a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+###Version next
+* Alarms activity improvements and fixes
+
 ###Version 0.18.3
 * Fix bug that caused the same value in weekly charts for every day on Android 6 and older
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index df30fac78..b15323fc7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -337,6 +337,7 @@
         <activity
             android:name=".activities.AlarmDetails"
             android:label="@string/title_activity_alarm_details"
+            android:screenOrientation="portrait"
             android:parentActivityName=".activities.ConfigureAlarms" />
         <activity
             android:name=".activities.VibrationActivity"
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
index 43744716a..d14db9dc6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AlarmDetails.java
@@ -105,7 +105,7 @@ public class AlarmDetails extends GBActivity {
     }
 
     private void updateAlarm() {
-        alarm.setSmartWakeup(cbSmartWakeup.isChecked());
+        alarm.setSmartWakeup(supportsSmartWakeup() && cbSmartWakeup.isChecked());
         alarm.setRepetition(cbMonday.isChecked(), cbTuesday.isChecked(), cbWednesday.isChecked(), cbThursday.isChecked(), cbFriday.isChecked(), cbSaturday.isChecked(), cbSunday.isChecked());
         alarm.setHour(timePicker.getCurrentHour());
         alarm.setMinute(timePicker.getCurrentMinute());
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
index 2946731e0..09f857ef2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/hplus/HPlusHealthSampleProvider.java
@@ -193,6 +193,9 @@ public class HPlusHealthSampleProvider extends AbstractSampleProvider<HPlusHealt
             for (HPlusHealthActivitySample sample : samples) {
 
                 if (sample.getTimestamp() >= overlay.getTimestampFrom() && sample.getTimestamp() < overlay.getTimestampTo()) {
+                    if(overlay.getRawKind() == ActivityKind.TYPE_LIGHT_SLEEP || overlay.getRawKind() == ActivityKind.TYPE_DEEP_SLEEP)
+                        sample.setRawIntensity(10);
+
                     sample.setRawKind(overlay.getRawKind());
                 }
             }
diff --git a/app/src/main/res/drawable/level_list_device.xml b/app/src/main/res/drawable/level_list_device.xml
index 7de9a84f2..0c5208894 100644
--- a/app/src/main/res/drawable/level_list_device.xml
+++ b/app/src/main/res/drawable/level_list_device.xml
@@ -5,10 +5,17 @@
     <item android:maxLevel="110" android:drawable="@drawable/ic_device_miband_disabled" />
     <item android:maxLevel="111" android:drawable="@drawable/ic_device_miband_disabled" />
     <item android:maxLevel="120" android:drawable="@drawable/ic_device_lovetoy_disabled" />
+    <item android:maxLevel="130" android:drawable="@drawable/ic_device_default_disabled" />
+    <item android:maxLevel="140" android:drawable="@drawable/ic_device_hplus_disabled" />
+    <item android:maxLevel="141" android:drawable="@drawable/ic_device_hplus_disabled" />
 
     <item android:maxLevel="199" android:drawable="@drawable/ic_launcher" />
     <item android:maxLevel="201" android:drawable="@drawable/ic_device_pebble" />
     <item android:maxLevel="210" android:drawable="@drawable/ic_device_miband" />
     <item android:maxLevel="211" android:drawable="@drawable/ic_device_miband" />
     <item android:maxLevel="220" android:drawable="@drawable/ic_device_lovetoy" />
+    <item android:maxLevel="230" android:drawable="@drawable/ic_launcher" />
+    <item android:maxLevel="240" android:drawable="@drawable/ic_device_hplus" />
+    <item android:maxLevel="241" android:drawable="@drawable/ic_device_hplus" />
+
 </level-list>
\ No newline at end of file
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index e881747ab..22c00ad66 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="next">
+        <change>Alarms activity improvements and fixes</change>
+    </release>
     <release version="0.18.3" versioncode="90">
         <change>Fix bug that caused the same value in weekly charts for every day on Android 6 and older</change>
     </release>