diff --git a/redisinsight/ui/src/components/base/forms/buttons/EmptyButton.tsx b/redisinsight/ui/src/components/base/forms/buttons/EmptyButton.tsx
index 8ab479dda7..4f04342dd3 100644
--- a/redisinsight/ui/src/components/base/forms/buttons/EmptyButton.tsx
+++ b/redisinsight/ui/src/components/base/forms/buttons/EmptyButton.tsx
@@ -2,12 +2,15 @@ import React from 'react'
 import { TextButton } from '@redis-ui/components'
 import { ButtonIcon } from 'uiSrc/components/base/forms/buttons/Button'
 import { IconType } from 'uiSrc/components/base/icons'
+import { Row } from '../../layout/flex'
+import { FlexProps } from '../../layout/flex/flex.styles'
 
 export type ButtonProps = React.ComponentProps<typeof TextButton> & {
   icon?: IconType
   iconSide?: 'left' | 'right'
   loading?: boolean
   size?: 'small' | 'large' | 'medium'
+  justify?: FlexProps['justify']
 }
 export const EmptyButton = ({
   children,
@@ -15,23 +18,28 @@ export const EmptyButton = ({
   iconSide = 'left',
   loading,
   size = 'small',
+  justify = 'center',
   ...rest
 }: ButtonProps) => (
   <TextButton {...rest}>
-    <ButtonIcon
-      buttonSide="left"
-      icon={icon}
-      iconSide={iconSide}
-      loading={loading}
-      size={size}
-    />
-    {children}
-    <ButtonIcon
-      buttonSide="right"
-      icon={icon}
-      iconSide={iconSide}
-      loading={loading}
-      size={size}
-    />
+    <Row
+      justify={justify}
+    >  
+      <ButtonIcon
+        buttonSide="left"
+        icon={icon}
+        iconSide={iconSide}
+        loading={loading}
+        size={size}
+      />
+      {children}
+      <ButtonIcon
+        buttonSide="right"
+        icon={icon}
+        iconSide={iconSide}
+        loading={loading}
+        size={size}
+      />
+    </Row>
   </TextButton>
 )
diff --git a/redisinsight/ui/src/pages/home/components/database-list-component/DatabasesListWrapper.tsx b/redisinsight/ui/src/pages/home/components/database-list-component/DatabasesListWrapper.tsx
index d71c18609e..eb8f7a129e 100644
--- a/redisinsight/ui/src/pages/home/components/database-list-component/DatabasesListWrapper.tsx
+++ b/redisinsight/ui/src/pages/home/components/database-list-component/DatabasesListWrapper.tsx
@@ -619,6 +619,7 @@ const DatabasesListWrapper = (props: Props) => {
                   <div className="controlsPopoverContent">
                     <div>
                       <EmptyButton
+                        justify="start"
                         icon={EditIcon}
                         className="editInstanceBtn"
                         aria-label="Edit instance"