diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css
index de8864fa7c..354e95805a 100644
--- a/infolog/templates/default/app.css
+++ b/infolog/templates/default/app.css
@@ -64,15 +64,17 @@ button.infologExtraButton {
 	height: 24px;
 }
 button.infologExtraButton:hover {
-	background-size: 16px;
+    background-size: 16px;
 }
-div.et2_hbox.tab_toolbar {
-	position: relative;
+
+.tab_toolbar {
+    position: relative;
 }
+
 button#infolog-edit_encrypt {
-	position: absolute;
-	right: 0px;
-	top: 3px;
+    position: absolute;
+    right: 0px;
+    top: 3px;
 }
 td.infologTimestamp {
 	position: relative;
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index 3683af0cc9..42edd288dc 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -229,17 +229,22 @@
 					</et2-hbox>
 				</row>
 				<row class="dialogFooterToolbar">
-					<hbox span="6">
-						<button statustext="Saves this entry" label="Save" id="button[save]" image="save" background_image="1"/>
-						<et2-button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1"></et2-button>
-						<button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-						<menulist>
-							<menupopup statustext="Execute a further action for this entry" id="action" onchange="app.infolog.edit_actions()" options="Actions..."/>
-						</menulist>
-						<checkbox label="Do not notify" id="no_notifications" statustext="Do not notify of these changes"/>
-					</hbox>
-					<button align="right" statustext="delete this entry" label="Delete" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" background_image="1" span="all"/>
-				</row>
+                    <hbox span="all">
+                        <button statustext="Saves this entry" label="Save" id="button[save]" image="save"
+                                background_image="1"/>
+                        <button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply"
+                                background_image="1"></button>
+                        <button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]"
+                                onclick="window.close();" image="cancel" background_image="1"/>
+                        <select statustext="Execute a further action for this entry" id="action"
+                                onchange="app.infolog.edit_actions()" empty_label="Actions..."/>
+                        <checkbox label="Do not notify" id="no_notifications"
+                                  statustext="Do not notify of these changes"/>
+                        <button align="right" statustext="delete this entry" label="Delete" id="button[delete]"
+                                onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');"
+                                image="delete" background_image="1" span="all"/>
+                    </hbox>
+                </row>
 			</rows>
 		</grid>
 	</template>
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index 411bf267cd..1ae7c392e7 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -132,7 +132,7 @@ button.infologExtraButton {
 button.infologExtraButton:hover {
   background-size: 16px;
 }
-div.et2_hbox.tab_toolbar {
+.tab_toolbar {
   position: relative;
 }
 button#infolog-edit_encrypt {