diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index 810ce0d88..192d811fe 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -233,55 +233,61 @@ function eventRender(event, element, view) {
     }
 
     //add the record/rebroadcast/soundcloud icons if needed
-    if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -1) {
-        $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span>');
-    } else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id > 0) {
-        $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon soundcloud"></span>');
-    } else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -2) {
-        $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon progress"></span>');
-    } else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -3) {
-        $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon sc-error"></span>');
-    }
-
-    if(view.name === 'month' && event.record === 1 && event.soundcloud_id === -1) {
-        $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span>');
-    } else if (view.name === 'month' && event.record === 1 && event.soundcloud_id > 0) {
-        $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon soundcloud"></span>');
-    } else if (view.name === 'month' && event.record === 1 && event.soundcloud_id === -2) {
-        $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon progress"></span>');
-    } else if (view.name === 'month' && event.record === 1 && event.soundcloud_id === -3) {
-        $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon sc-error"></span>');
-    }
-
-    if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
-        if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
-            $(element)
-                .find(".fc-event-time")
-                .before('<span id="'+event.id+'" class="small-icon show-empty"></span>');
-        } else if (event.show_partial_filled === true) {
-            $(element)
-                .find(".fc-event-time")
-                .before('<span id="'+event.id+'" class="small-icon show-partial-filled"></span>');
+    if (event.record === 1) {
+        if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
+            if (event.soundcloud_id === -1) {
+                $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span>');
+            } else if ( event.soundcloud_id > 0) {
+                $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon soundcloud"></span>');
+            } else if (event.soundcloud_id === -2) {
+                $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon progress"></span>');
+            } else if (event.soundcloud_id === -3) {
+                $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon sc-error"></span>');
+            }
+        } else if (view.name === 'month') {
+            if(event.soundcloud_id === -1) {
+                $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span>');
+            } else if (event.soundcloud_id > 0) {
+                $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon soundcloud"></span>');
+            } else if (event.soundcloud_id === -2) {
+                $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon progress"></span>');
+            } else if (event.soundcloud_id === -3) {
+                $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon recording"></span><span id="'+event.id+'" class="small-icon sc-error"></span>');
+            }
         }
-    } else if (view.name === 'month') {
-        if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
-            $(element)
-                .find(".fc-event-title")
-                .after('<span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
-        } else if (event.show_partial_filled === true) {
-            $(element)
-                .find(".fc-event-title")
-                .after('<span id="'+event.id+'" title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
+    }
+
+    if (event.record === 0 && event.rebroadcast === 0) {
+        if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
+            if (event.show_empty === 1) {
+                $(element)
+                    .find(".fc-event-time")
+                    .before('<span id="'+event.id+'" class="small-icon show-empty"></span>');
+            } else if (event.show_partial_filled === true) {
+                $(element)
+                    .find(".fc-event-time")
+                    .before('<span id="'+event.id+'" class="small-icon show-partial-filled"></span>');
+            }
+        } else if (view.name === 'month') {
+            if (event.show_empty === 1) {
+                $(element)
+                    .find(".fc-event-title")
+                    .after('<span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
+            } else if (event.show_partial_filled === true) {
+                $(element)
+                    .find(".fc-event-title")
+                    .after('<span id="'+event.id+'" title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
+            }
         }
     }
 
     //rebroadcast icon
-    if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) {
-        $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon rebroadcast"></span>');
-    }
-    
-    if(view.name === 'month' && event.rebroadcast === 1) {
-        $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon rebroadcast"></span>');
+    if (event.rebroadcast === 1) {
+        if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
+            $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon rebroadcast"></span>');
+        } else if (view.name === 'month') {
+            $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon rebroadcast"></span>');
+        }
     }
 }