diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index e59306ab7b..d95197fb04 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -382,7 +382,6 @@ class calendar_uiviews extends calendar_ui
 			),
 			'today' => array(
 				'caption' => 'Today',
-				'icon'	=> 'today',
 				'group' => $group,
 				'onExecute' => 'javaScript:app.calendar.toolbar_action',
 				'hint' => 'Today',
diff --git a/etemplate/js/et2_widget_toolbar.js b/etemplate/js/et2_widget_toolbar.js
index 34585edf57..b8c2fca00f 100644
--- a/etemplate/js/et2_widget_toolbar.js
+++ b/etemplate/js/et2_widget_toolbar.js
@@ -508,11 +508,11 @@ var et2_toolbar = et2_DOMWidget.extend([et2_IInput],
 		if (action.caption)
 		{
 			if ((this.countActions <= parseInt(this.options.view_range) ||
-					this.preference[action.id])	&&
+					this.preference[action.id] || !action.iconUrl)	&&
 					typeof button[0] !== 'undefined' &&
 					!(action.checkbox && action.data && (action.data.toggle_on || action.data.toggle_off))) // no caption for slideswitch checkboxes 
 			{
-				button.addClass('et2_toolbar_hasCaption');
+				button.addClass(action.iconUrl?'et2_toolbar_hasCaption':'et2_toolbar_onlyCaption');
 				button[0].textContent = action.caption;
 			}
 		}
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 320f0f5bf7..94b84e797d 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -1556,6 +1556,11 @@ div.ms-sel-ctn .ms-sel-item {
 	background-position: 6px center;
 	padding-left: 30px;
 }
+.et2_toolbar .et2_toolbar_actionlist button.et2_button_with_image.et2_toolbar_onlyCaption {
+	vertical-align: top;
+	width:auto;
+	padding-left: 3px;
+}
 .et2_toolbar button {
 	margin:1px;
 	margin-right: 3px;