diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index b66186e7e7..0223151616 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -848,7 +848,7 @@ input.global-search-input {
 }
 
 .button-container {
-    padding: 0 0 10px;
+    padding: 0 0 var(--vertical-gap);
 }
 
 .margin.list-group-item:first-child {
@@ -3258,6 +3258,10 @@ table.table-admin-panel {
     line-height: 32px;
 }
 
+.search-container {
+    margin-bottom: @padding-base-vertical;
+}
+
 .search-row {
     .input-group button.search {
         margin-left: -2px;