diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 70d8597678..b32f6d6a06 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -123,7 +123,8 @@ class mail_compose
 				'icon' => 'save',
 				'group' => ++$group,
 				'onExecute' => 'javaScript:app.mail.saveAsDraft',
-				'hint' => 'Save as Draft'
+				'hint' => 'Save as Draft',
+				'toolbarDefault' => true
 			),
 			'button[saveAsDraftAndPrint]' => array(
 				'caption' => 'Print',
@@ -150,30 +151,33 @@ class mail_compose
 			),
 			'to_infolog' => array(
 				'caption' => 'Infolog',
-				'icon' => 'infolog/navbar',
+				'icon' => 'to_infolog',
 				'group' => ++$group,
 				'checkbox' => true,
-				'hint' => 'check to save as infolog on send'
+				'hint' => 'check to save as infolog on send',
+				'toolbarDefault' => true
 			),
 			'to_tracker' => array(
 				'caption' => 'Tracker',
-				'icon' => 'tracker/navbar',
+				'icon' => 'to_tracker',
 				'group' => $group,
 				'checkbox' => true,
 				'hint' => 'check to save as trackerentry on send'
 			),
 			'disposition' => array(
 				'caption' => 'Notification',
-				'icon' => 'notification',
+				'icon' => 'high',
 				'group' => ++$group,
 				'checkbox' => true,
-				'hint' => 'check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)'
+				'hint' => 'check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)',
+				'toolbarDefault' => true
 			),
 			'prty' => array(
 				'caption' => 'Priority',
 				'group' => ++$group,
 				'children' => array(),
-				'hint' => '',
+				'toolbarDefault' => true,
+				'hint' => 'Select the message priority tag'
 			)
 		);
 		foreach (self::$priorities as $priority)
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index ab5b2fa935..442538015a 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -3,7 +3,7 @@
 <overlay>
 	<template id="mail.compose" template="" lang="" group="0" version="1.9.001">
 		<vbox class="mailCompose mailComposeHeaderSection" width="100%">
-			<toolbar id="composeToolbar" width="et2_fullWidth" view_range="6" flat_list="false"/>
+			<toolbar id="composeToolbar" width="et2_fullWidth" view_range="7" flat_list="false"/>
 			<hbox class="mail-compose_toolbar_assist" width="100%">
 				<vfs-select class="$cont[vfsNotAvailable] compose_egw_icons" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose" button_caption=""/>
 				<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='attachments' onFinish="app.mail.uploadForCompose" onStart="app.mail.composeUploadStart" id="uploadForCompose" drop_target ="mail-compose"/>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 913825c4a8..df4849c244 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -400,7 +400,7 @@ div.mailUploadSection > div.et2_hbox > label {
   background-position: left;
   background-repeat: no-repeat;
 }
-.mail-compose_toolbar {
+.mail-compose_composeToolbar {
   border-left: 1px solid silver;
   border-top: 1px solid silver;
   border-right: 1px solid gray;
@@ -410,11 +410,11 @@ div.mailUploadSection > div.et2_hbox > label {
   background-position: center;
   background-repeat: repeat-x;
 }
-.mail-compose_toolbar > span {
+.mail-compose_composeToolbarr > span {
   padding: 10px;
   white-space: nowrap;
 }
-.mail-compose_toolbar > span.priority {
+.mail-compose_composeToolbar > span.priority {
   border-right: none;
 }
 .compose_egw_icons {
@@ -459,23 +459,23 @@ div.mail-compose_fileselector {
   overflow: scroll;
   overflow-x: hidden;
 }
-#mail-compose_toolbar {
+#mail-compose_composeToolbar {
   padding: 0px !important;
 }
-#mail-compose_toolbar > button {
+#mail-compose_composeToolbar > button {
   padding: .2em .4em;
 }
-#mail-compose_toolbar > img {
+#mail-compose_composeToolbar > img {
   width: 16px;
   padding: 0px;
   height: 16px !important;
 }
-#mail-compose_toolbar > button > span > img {
+#mail-compose_composeToolbar > button > span > img {
   width: 16px;
   padding: 0px;
   height: 16px !important;
 }
-#mail-compose_toolbar > button {
+#mail-compose_composeToolbar > button {
   padding: .2em .4em;
 }
 #mail-compose_to div.ms-sel-ctn,
@@ -1094,7 +1094,6 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
   text-align: left;
   font-weight: normal;
   padding-left: 20px;
-  width: 71px;
   float: left;
   background-image: url(images/mail_send.png);
   background-position: left;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index c8b05753cb..dd6a5df72f 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -361,7 +361,6 @@ div#mail-index{
             text-align: left;
             font-weight: normal;
             padding-left: 20px;
-            width: 71px;
             float: left;
             background-image: url(images/mail_send.png);
             background-position: left;