=== jive/slim/Player.lua
==================================================================
--- jive/slim/Player.lua	(revision 48928)
+++ jive/slim/Player.lua	(local)
@@ -1151,11 +1151,7 @@
 			iconbar:setSleep('OFF')
 		end
 
-		if self:getAlarmState() == 'set' or self:getAlarmState() == 'snooze' then
-			iconbar:setAlarm('ON')
-		else
-			iconbar:setAlarm('OFF')
-		end
+		-- alarm icon in iconbar is set directly via AlarmSnoozeApplet
 
 		iconbar:setRepeat(0)
 
=== applets/AlarmSnooze/AlarmSnoozeApplet.lua
==================================================================
--- applets/AlarmSnooze/AlarmSnoozeApplet.lua	(revision 48928)
+++ applets/AlarmSnooze/AlarmSnoozeApplet.lua	(local)
@@ -678,7 +678,6 @@
 function _alarmOff(self, stopStream)
 	if self.alarmInProgress == 'rtc' then
 		self:_silenceFallbackAlarm()
-		iconbar:setAlarm('OFF')
 		log:warn('_alarmOff: RTC alarm canceled')
 	else
 		if self.localPlayer:isConnected() then
@@ -717,6 +716,9 @@
 		log:warn('_stopTimer: stopping WOL timer')
 		self.wakeOnLanTimer:stop()
 	end
+
+	-- no RTC timer means no alarm, so let's go ahead and remove our alarm icon
+	iconbar:setAlarm('OFF')
 end
 
 
@@ -786,6 +788,7 @@
 	end
 
 	self.RTCAlarmTimer:start()
+	iconbar:setAlarm('ON')
 end