diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java
index b64578782..8f669318b 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java
@@ -42,11 +42,11 @@ import com.vaadin.ui.themes.ValoTheme;
 public abstract class AbstractFilterButtons extends Table {
 
     private static final long serialVersionUID = 7783305719009746375L;
-    
+
     private static final String DEFAULT_GREEN = "rgb(44,151,32)";
 
     protected static final String FILTER_BUTTON_COLUMN = "filterButton";
-    
+
     @Autowired
     protected transient EventBus.SessionEventBus eventBus;
 
@@ -63,7 +63,7 @@ public abstract class AbstractFilterButtons extends Table {
         createTable();
         eventBus.subscribe(this);
     }
-    
+
     @PreDestroy
     void destroy() {
         eventBus.unsubscribe(this);
@@ -120,6 +120,7 @@ public abstract class AbstractFilterButtons extends Table {
                         ? item.getItemProperty(SPUILabelDefinitions.VAR_COLOR).getValue().toString() : DEFAULT_GREEN;
         final Button typeButton = createFilterButton(id, name, desc, color, itemId);
         typeButton.addClickListener(event -> filterButtonClickBehaviour.processFilterButtonClick(event));
+        typeButton.addStyleName("generatedColumnPadding");
         if (typeButton.getData().equals(SPUIDefinitions.NO_TAG_BUTTON_ID) && isNoTagSateSelected()) {
             filterButtonClickBehaviour.setDefaultClickedButton(typeButton);
         } else if (id != null && isClickedByDefault(name)) {
diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss
index 8820dbcc9..81d590248 100644
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss
@@ -181,4 +181,8 @@
     visibility: hidden;
     float: right;
   }
+  
+  .v-button-generatedColumnPadding .v-button-tiny {
+  	padding: 0 0px;
+  }
 }