diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
index 969436904..3c153cb77 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
@@ -152,18 +152,18 @@ public abstract class AbstractTableDetailsLayout<T extends NamedEntity> extends
         final HorizontalLayout nameEditLayout = new HorizontalLayout();
         nameEditLayout.setWidth(100.0f, Unit.PERCENTAGE);
         nameEditLayout.addComponent(caption);
-        nameEditLayout.setComponentAlignment(caption, Alignment.MIDDLE_LEFT);
+        nameEditLayout.setComponentAlignment(caption, Alignment.TOP_LEFT);
         if (hasEditPermission()) {
             nameEditLayout.addComponent(editButton);
-            nameEditLayout.setComponentAlignment(editButton, Alignment.MIDDLE_RIGHT);
+            nameEditLayout.setComponentAlignment(editButton, Alignment.TOP_RIGHT);
         }
         nameEditLayout.setExpandRatio(caption, 1.0f);
         nameEditLayout.addStyleName(SPUIStyleDefinitions.WIDGET_TITLE);
 
         addComponent(nameEditLayout);
-        setComponentAlignment(nameEditLayout, Alignment.MIDDLE_CENTER);
+        setComponentAlignment(nameEditLayout, Alignment.TOP_CENTER);
         addComponent(detailsTab);
-        setComponentAlignment(nameEditLayout, Alignment.MIDDLE_CENTER);
+        setComponentAlignment(nameEditLayout, Alignment.TOP_CENTER);
 
         setSizeFull();
         setHeightUndefined();
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
index b4709ccd1..0c5407316 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
@@ -44,7 +44,7 @@ import com.vaadin.ui.VerticalLayout;
 public abstract class AbstractTableHeader extends VerticalLayout {
 
     private static final long serialVersionUID = 4881626370291837175L;
-    
+
     @Autowired
     protected I18N i18n;
 
@@ -53,7 +53,6 @@ public abstract class AbstractTableHeader extends VerticalLayout {
 
     @Autowired
     protected transient EventBus.SessionEventBus eventbus;
-    
 
     private Label headerCaption;
 
@@ -83,7 +82,7 @@ public abstract class AbstractTableHeader extends VerticalLayout {
         restoreState();
         eventbus.subscribe(this);
     }
-    
+
     @PreDestroy
     void destroy() {
         eventbus.unsubscribe(this);
@@ -195,7 +194,7 @@ public abstract class AbstractTableHeader extends VerticalLayout {
             dropHintDropFilterLayout.setExpandRatio(dropFilterLayout, 1.0f);
         }
         addComponent(dropHintDropFilterLayout);
-        setComponentAlignment(dropHintDropFilterLayout, Alignment.MIDDLE_CENTER);
+        setComponentAlignment(dropHintDropFilterLayout, Alignment.TOP_CENTER);
         addStyleName("bordered-layout");
         addStyleName("no-border-bottom");
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
index bbbba8cec..dd8c0e5f9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
@@ -139,7 +139,7 @@ public final class DashboardMenu extends CustomComponent {
         final Label logo = new Label("<strong>" + i18n.get("menu.title") + "</strong>", ContentMode.HTML);
         logo.setSizeUndefined();
         final HorizontalLayout logoWrapper = new HorizontalLayout(logo);
-        logoWrapper.setComponentAlignment(logo, Alignment.MIDDLE_CENTER);
+        logoWrapper.setComponentAlignment(logo, Alignment.TOP_CENTER);
         logoWrapper.addStyleName("valo-menu-title");
         return logoWrapper;
     }