diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css
index f56c73f556..58b84b527c 100644
--- a/infolog/templates/default/app.css
+++ b/infolog/templates/default/app.css
@@ -71,19 +71,14 @@ button.infologExtraButton:hover {
     position: relative;
 }
 
-button#infolog-edit_encrypt {
-    position: absolute;
-    right: 0px;
-    top: 3px;
+.tab_toolbar > button, .tab_toolbar > et2-button {
+    margin: 0px;
 }
+
 td.infologTimestamp {
-	position: relative;
-}
-button#infolog-edit_timestamp {
-	position: absolute;
-	right: 29px;
-	top: 3px;
+    position: relative;
 }
+
 div#infolog-edit_infolog-edit-description {
 	height: 250px;
 }
diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css
index ef1a9980a8..f9f73d48f9 100755
--- a/infolog/templates/pixelegg/app.css
+++ b/infolog/templates/pixelegg/app.css
@@ -135,19 +135,13 @@ button.infologExtraButton:hover {
 .tab_toolbar {
   position: relative;
 }
-button#infolog-edit_encrypt {
-  position: absolute;
-  right: 0px;
-  top: 3px;
+.tab_toolbar > button,
+.tab_toolbar > et2-button {
+  margin: 0px;
 }
 td.infologTimestamp {
   position: relative;
 }
-button#infolog-edit_timestamp {
-  position: absolute;
-  right: 29px;
-  top: 3px;
-}
 div#infolog-edit_infolog-edit-description {
   height: 250px;
 }
@@ -248,12 +242,6 @@ input#infolog-edit_info_subject {
   max-height: 150px;
 }
 /*Historie*/
-button#infolog-edit_encrypt {
-  top: 13px;
-}
-button#infolog-edit_timestamp {
-  top: 13px;
-}
 #infolog-index table.egwGridView_grid img {
   height: 16px;
 }
diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less
index c6b651e226..0c700a75fc 100755
--- a/infolog/templates/pixelegg/app.less
+++ b/infolog/templates/pixelegg/app.less
@@ -151,15 +151,6 @@ input#infolog-edit_info_subject {width: 98% !important;}
 }
 
 /*Historie*/
-
-// InfoLog encryption
-button#infolog-edit_encrypt {
-  top: 13px;
-}
-button#infolog-edit_timestamp {
-  top: 13px;
-}
-
 #infolog-index table.egwGridView_grid {
    img{height: 16px;}
 }