diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index e42da056aa..41937d68e6 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -934,6 +934,10 @@ class calendar_boupdate extends calendar_bo
 					Api\Translation::init();
 					$lang = $part_prefs['common']['lang'];
 				}
+
+				// Since we're running from cron, make sure notifications uses user's theme (for images)
+				$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw_info']['user']['preferences']['common']['template_set'];
+				
 				$event_arr = null;
 				$details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event,
 					$action, $event_arr, $disinvited);
diff --git a/notifications/inc/hook_after_navbar.inc.php b/notifications/inc/hook_after_navbar.inc.php
index 07e18665a8..3197238c7e 100644
--- a/notifications/inc/hook_after_navbar.inc.php
+++ b/notifications/inc/hook_after_navbar.inc.php
@@ -25,11 +25,11 @@ if ($GLOBALS['egw_info']['user']['apps']['notifications'])
 	echo '
 		<div id="egwpopup" style="display: none; z-index: 999;">
 			<div id="egwpopup_header">'.lang('Notification'). '<span style="float:right;">'.
-				Api\Html::submit_button('egwpopup_close_button', 'X', '', true, 'id="egwpopup_close_button"', 'close.button') .
+				Api\Html::submit_button('egwpopup_close_button', 'X', '', true, 'id="egwpopup_close_button"', 'close') .
 			'</span></div>
 			<div id="egwpopup_message"></div>
 			<div id="egwpopup_footer">
-				<input id="egwpopup_ok_button" type="button" value="'. lang('ok'). '">
+				<input id="egwpopup_ok_button" class="et2_button et2_button_text" type="button" value="'. lang('ok'). '">
 			</div>
 		</div>
 	';