diff --git a/src/Mod/AddonManager/Widgets/addonmanager_widget_search.py b/src/Mod/AddonManager/Widgets/addonmanager_widget_search.py
index 28d2060f9c..7da8b1c271 100644
--- a/src/Mod/AddonManager/Widgets/addonmanager_widget_search.py
+++ b/src/Mod/AddonManager/Widgets/addonmanager_widget_search.py
@@ -63,6 +63,7 @@ class WidgetSearch(QtWidgets.QWidget):
 
     def _setup_ui(self):
         self.horizontal_layout = QtWidgets.QHBoxLayout()
+        self.horizontal_layout.setContentsMargins(0, 0, 0, 0)
         self.filter_line_edit = QtWidgets.QLineEdit(self)
         self.filter_line_edit.setClearButtonEnabled(True)
         self.horizontal_layout.addWidget(self.filter_line_edit)
diff --git a/src/Mod/AddonManager/Widgets/addonmanager_widget_view_control_bar.py b/src/Mod/AddonManager/Widgets/addonmanager_widget_view_control_bar.py
index 286ceac589..46c0430e46 100644
--- a/src/Mod/AddonManager/Widgets/addonmanager_widget_view_control_bar.py
+++ b/src/Mod/AddonManager/Widgets/addonmanager_widget_view_control_bar.py
@@ -57,6 +57,7 @@ class WidgetViewControlBar(QtWidgets.QWidget):
 
     def _setup_ui(self):
         self.horizontal_layout = QtWidgets.QHBoxLayout()
+        self.horizontal_layout.setContentsMargins(0, 0, 0, 0)
         self.view_selector = WidgetViewSelector(self)
         self.filter_selector = WidgetFilterSelector(self)
         self.search = WidgetSearch(self)
diff --git a/src/Mod/AddonManager/Widgets/addonmanager_widget_view_selector.py b/src/Mod/AddonManager/Widgets/addonmanager_widget_view_selector.py
index 7bcb9ff7ba..dca81ec6f8 100644
--- a/src/Mod/AddonManager/Widgets/addonmanager_widget_view_selector.py
+++ b/src/Mod/AddonManager/Widgets/addonmanager_widget_view_selector.py
@@ -92,6 +92,8 @@ class WidgetViewSelector(QtWidgets.QWidget):
 
     def _setup_ui(self):
         self.horizontal_layout = QtWidgets.QHBoxLayout()
+        self.horizontal_layout.setContentsMargins(0, 0, 0, 0)
+        self.horizontal_layout.setSpacing(2)
         self.compact_button = QtWidgets.QToolButton(self)
         self.compact_button.setObjectName("compact_button")
         self.compact_button.setIcon(