diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 5e0fc2bce..9644a5593 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -4,6 +4,11 @@
 	margin-bottom: -1px;
 }
 
+#events-spinner .spinner {
+	margin-top: 9px;
+	margin-bottom: -9px;
+}
+
 .bootstrap-tagsinput {
 	width: 100%;
 	padding: 6px 12px;
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 6a38057fd..745cdc0e6 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -55,7 +55,11 @@
 				showEvent(calEvent.id);
 			},
 			loading: function(isLoading, view) {
+				$('#events-spinner').spin('tiny');
+				$('#events-spinner > i').css('color', 'transparent');
 				if(!isLoading) {
+					$('#events-spinner').spin(false);
+					$('#events-spinner > i').css('color', 'unset');
 					$('td.fc-day').dblclick(function() {
 						openMenu('form');
 						//window.location.href='/events/new?start='+$(this).data('date');
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index b2de90da1..2b6170ff4 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,12 +1,13 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
+
 			<button class="btn btn-default btn-xs" onclick="openClose('event-tools'); closeMenu('form');"><i class="icon-cog"></i></button>
 			<button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button>
 
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
-				<button class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
+				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
 				<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
 			</div>
 		</div>