diff --git a/Ginger/Ginger/Environments/AddNewDatabasePage.xaml b/Ginger/Ginger/Environments/AddNewDatabasePage.xaml
index 3bc4e75356..0b60fd4541 100644
--- a/Ginger/Ginger/Environments/AddNewDatabasePage.xaml
+++ b/Ginger/Ginger/Environments/AddNewDatabasePage.xaml
@@ -19,7 +19,7 @@
         <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25"  VerticalAlignment="Top" Margin="0,10,0,0" >
             <Label Style="{StaticResource $LabelStyle}" Width="180" FontSize="13" Content="Database:"/>
             <StackPanel Orientation="Vertical">
-                <ComboBox  Name="xDatabaseComboBox" Style="{StaticResource $FlatEditInputComboBoxStyle}" Width="250" SelectionChanged="xDatabaseComboBox_SelectionChanged" ></ComboBox>
+                <ComboBox  Name="xDatabaseComboBox" Style="{StaticResource $FlatEditInputComboBoxStyle}" Width="350" SelectionChanged="xDatabaseComboBox_SelectionChanged" ></ComboBox>
                 <TextBlock Name="xDatabaseTypeError" VerticalAlignment="Bottom" Margin="0,0,0,0" Visibility="Collapsed" Foreground="Red"/>
             </StackPanel>
         </StackPanel>
@@ -33,20 +33,20 @@
         <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
             <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Database Name:" />
                 <StackPanel Orientation="Vertical">
-                    <TextBox Style="{StaticResource $TextBoxStyle}"  x:Name="xDatabaseName" Width="250" Height="25"></TextBox>
+                    <TextBox Style="{StaticResource $TextBoxStyle}"  x:Name="xDatabaseName" Width="350" Height="25"></TextBox>
                     <TextBlock  Name="xDatabaseNameError" VerticalAlignment="Bottom" Margin="0,0,0,0" Visibility="Collapsed" Foreground="Red"/>
             </StackPanel>
         </StackPanel>
     
         <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
             <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Description:"/>
-            <TextBox Style="{StaticResource $TextBoxStyle}"  x:Name="xDatabaseDescription" Width="250"></TextBox>
+            <TextBox Style="{StaticResource $TextBoxStyle}"  x:Name="xDatabaseDescription" Width="350"></TextBox>
         </StackPanel>
         <StackPanel x:Name="xDatabaseDetailsPanel">
             <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
                 <Label Style="{StaticResource $LabelStyle}" Width="180" Content="TNS / File Path:"  Name="xDatabaseTNSName"/>
                 <StackPanel Orientation="Vertical">
-                    <businessflowwindows:UCValueExpression x:Name="xDatabaseTNS" Width="280" Height="25"></businessflowwindows:UCValueExpression>
+                    <businessflowwindows:UCValueExpression x:Name="xDatabaseTNS" Width="380" Height="25"></businessflowwindows:UCValueExpression>
                     <TextBlock  Name="xDatabaseTNSError" VerticalAlignment="Bottom" Margin="0,0,0,0" Visibility="Collapsed" Foreground="Red"/>
                 </StackPanel>
             </StackPanel>
@@ -54,7 +54,7 @@
             <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" Margin="0,10,0,0">
                 <Label Style="{StaticResource $LabelStyle}" Width="180" Content="User Name:"/>
                 <StackPanel Orientation="Vertical">
-                    <businessflowwindows:UCValueExpression x:Name="xDatabaseUserName" Width="280" Height="25"></businessflowwindows:UCValueExpression>
+                    <businessflowwindows:UCValueExpression x:Name="xDatabaseUserName" Width="380" Height="25"></businessflowwindows:UCValueExpression>
                     <TextBlock Name="xDatabaseUserNameError" VerticalAlignment="Bottom" Margin="0,0,0,0" Visibility="Collapsed" Foreground="Red"/>
                 </StackPanel>
             </StackPanel>
@@ -62,8 +62,8 @@
             <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0" >
                 <Label Style="{StaticResource $LabelStyle}" Width="180"  Content="User Password:"/>
                 <StackPanel Orientation="Vertical">
-                    <businessflowwindows:UCValueExpression x:Name="xDatabasePassword" Width="280" Height="25" LostKeyboardFocus="ChangeDatabasePass"></businessflowwindows:UCValueExpression>
-                    <TextBlock Name="xDatabaseUserPassError" Width="250" VerticalAlignment="Bottom" Margin="0,0,0,0" Visibility="Collapsed" Foreground="Red"/>
+                    <businessflowwindows:UCValueExpression x:Name="xDatabasePassword" Width="380" Height="25" LostKeyboardFocus="ChangeDatabasePass"></businessflowwindows:UCValueExpression>
+                    <TextBlock Name="xDatabaseUserPassError" Width="380" VerticalAlignment="Bottom" Margin="0,0,0,0" Visibility="Collapsed" Foreground="Red"/>
                 </StackPanel>
             </StackPanel>
 
@@ -74,7 +74,7 @@
             <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
                 <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Account End Point:" />
                 <StackPanel Orientation="Vertical">
-                    <businessflowwindows:UCValueExpression  x:Name="xDBAccEndPoint" Width="280" Height="25"></businessflowwindows:UCValueExpression>
+                    <businessflowwindows:UCValueExpression  x:Name="xDBAccEndPoint" Width="380" Height="25"></businessflowwindows:UCValueExpression>
                     <TextBlock  Name="xDBAccEndPointError" VerticalAlignment="Bottom" Margin="0,0,0,0" Visibility="Collapsed" Foreground="Red"/>
                 </StackPanel>
             </StackPanel>
@@ -82,7 +82,7 @@
             <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
                 <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Account Key:" />
                 <StackPanel Orientation="Vertical">
-                    <businessflowwindows:UCValueExpression  x:Name="xDBAccKey" Width="280" Height="25"></businessflowwindows:UCValueExpression>
+                    <businessflowwindows:UCValueExpression  x:Name="xDBAccKey" Width="380" Height="25"></businessflowwindows:UCValueExpression>
                     <TextBlock  Name="xDBAccKeyError" VerticalAlignment="Bottom" Margin="0,0,0,0" Visibility="Collapsed" Foreground="Red"/>
                 </StackPanel>
             </StackPanel>
@@ -90,9 +90,9 @@
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0" Name="xDBConnectionStringPanel" Visibility="Collapsed">
-            <Label Style="{StaticResource $LabelStyle}" Width="180" Height="25" Content="Connection String:"/>
+            <Label Style="{StaticResource $LabelStyle}" Width="180" Height="40" Content="Connection String:"/>
             <StackPanel Orientation="Horizontal">
-                <businessflowwindows:UCValueExpression  x:Name="xDatabaseConnectionString" Height="25" Width="280"></businessflowwindows:UCValueExpression>
+                <businessflowwindows:UCValueExpression  x:Name="xDatabaseConnectionString" Height="40" Width="380"></businessflowwindows:UCValueExpression>
                 <usercontrols:ImageMakerControl 
                     VerticalAlignment="Center" 
                     x:Name="xConnectionStringInfo" SetAsFontImageWithSize="12" ImageType="Info" Width="12" Height="12" FontWeight="Bold" Foreground="{StaticResource $BackgroundColor_DarkGray}" Margin="2,0,0,0"/>
diff --git a/Ginger/Ginger/Environments/AddNewDatabasePage.xaml.cs b/Ginger/Ginger/Environments/AddNewDatabasePage.xaml.cs
index 9a0b9f1715..18eef6af02 100644
--- a/Ginger/Ginger/Environments/AddNewDatabasePage.xaml.cs
+++ b/Ginger/Ginger/Environments/AddNewDatabasePage.xaml.cs
@@ -43,6 +43,8 @@ public AddNewDatabasePage(ObservableList<IDatabase> dataSourceList, Context cont
             xDBAccKey.Init(context, database, nameof(Database.Pass));
 
             xDatabaseConnectionString.Init(context, database, nameof(Database.ConnectionString));
+            xDatabaseConnectionString.Row.Height = new System.Windows.GridLength(100);
+            xDatabaseConnectionString.ValueTextBox.Height = 40;
             BindingHandler.ObjFieldBinding(xDatabaseName, TextBox.TextProperty, database, nameof(Database.Name));
             BindingHandler.ObjFieldBinding(xDatabaseDescription, TextBox.TextProperty, database, nameof(Database.Description));
             BindingHandler.ObjFieldBinding(xDatabaseComboBox, ComboBox.SelectedValueProperty, database, nameof(Database.DBType));
diff --git a/Ginger/Ginger/Variables/EditDatabasePage.xaml b/Ginger/Ginger/Variables/EditDatabasePage.xaml
index 4b2a09d656..4cc8635582 100644
--- a/Ginger/Ginger/Variables/EditDatabasePage.xaml
+++ b/Ginger/Ginger/Variables/EditDatabasePage.xaml
@@ -13,32 +13,32 @@
         <Border Margin="0,10,0,0" BorderBrush="{StaticResource $BackgroundColor_DarkGray}" BorderThickness="0.6" CornerRadius="3" HorizontalAlignment="Stretch">
             <StackPanel Background="{StaticResource $BackgroundColor_White}" Margin="10,10,10,10" Orientation="Vertical">
 
-                <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25"  VerticalAlignment="Top" Margin="0,10,0,0" >
+                <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25"  VerticalAlignment="Top" Margin="0,15,0,0" >
                     <Label Style="{StaticResource $LabelStyle}" Width="180" FontSize="13" Content="Database:"/>
                     <TextBox x:Name="xDatabaseType" IsReadOnly="True" Width="400" Style="{StaticResource $TextBoxStyle}" Background="#FFEFEFF2" Margin="0,0,50,0" />
                 </StackPanel>
 
-                <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
+                <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,15,0,0">
                     <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Database Name:" />
-                    <TextBox Style="{StaticResource $TextBoxStyle}" Height="25" LostKeyboardFocus="XDatabaseName_TextChanged"  x:Name="xDatabaseName" Width="400" Margin="0,0,0,8" ></TextBox>
+                    <TextBox Style="{StaticResource $TextBoxStyle}" Height="25" LostKeyboardFocus="XDatabaseName_TextChanged"  x:Name="xDatabaseName" Width="400"></TextBox>
                 </StackPanel>
 
-                <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
+                <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,15,0,0">
                     <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Description:"/>
                     <TextBox Style="{StaticResource $TextBoxStyle}"  x:Name="xDatabaseDescription" Width="400"></TextBox>
                 </StackPanel>
                 <StackPanel x:Name="xDatabaseDetailsPanel">
-                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
+                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,15,0,0">
                         <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Data Source"  Name="xDatabaseTNSName"/>
                         <businessflowwindows:UCValueExpression x:Name="xDatabaseTNS" Width="430"></businessflowwindows:UCValueExpression>
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" Margin="0,10,0,0">
+                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" Margin="0,15,0,0">
                         <Label Style="{StaticResource $LabelStyle}" Width="180" Content="User Name:"/>
                         <businessflowwindows:UCValueExpression x:Name="xDatabaseUserName" Width="430"></businessflowwindows:UCValueExpression>
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0" >
+                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,15,0,0" >
                         <Label Style="{StaticResource $LabelStyle}" Width="180"  Content="User Password:"/>
                         <businessflowwindows:UCValueExpression x:Name="xDatabasePassword" Width="430" LostKeyboardFocus="ChangeDatabasePass"></businessflowwindows:UCValueExpression>
                     </StackPanel>
@@ -47,17 +47,17 @@
 
                 <StackPanel Name="xCosmosDetailsPanel" Visibility="Collapsed">
 
-                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
+                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,15,0,0">
                         <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Account End Point:" />
                         <businessflowwindows:UCValueExpression  x:Name="xDBAccEndPoint" Width="430" Height="25"></businessflowwindows:UCValueExpression>
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,10,0,0">
+                    <StackPanel Orientation="Horizontal" Height="auto" MinHeight="25" VerticalAlignment="Top" Margin="0,15,0,0">
                         <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Account Key:" />
                         <businessflowwindows:UCValueExpression  x:Name="xDBAccKey" Width="430" Height="25"></businessflowwindows:UCValueExpression>
                     </StackPanel>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                <StackPanel Orientation="Horizontal" Margin="0,15,0,0">
                     <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Connection String:"/>
                     <StackPanel Orientation="Horizontal">
                         <businessflowwindows:UCValueExpression  x:Name="xDatabaseConnectionString" MinHeight="20" MaxHeight="40" Width="430"></businessflowwindows:UCValueExpression>
@@ -67,12 +67,12 @@
                     </StackPanel>
                 </StackPanel>
 
-                <StackPanel Orientation="Horizontal" Name="xKeepConnectOpenPanel" Margin="0,10,0,0" >
+                <StackPanel Orientation="Horizontal" Name="xKeepConnectOpenPanel" Margin="0,15,0,0" >
                     <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Keep Connection Open:"/>
                     <CheckBox VerticalAlignment="Center" Name="xKeepConnectOpen" ></CheckBox>
                 </StackPanel>
-                
-                <StackPanel Orientation="Horizontal" Name="xVersionStackPanel" Visibility="Collapsed" Margin="0,10,0,0">
+
+                <StackPanel Orientation="Horizontal" Name="xVersionStackPanel" Visibility="Collapsed" Margin="0,15,0,0">
                     <Label Style="{StaticResource $LabelStyle}" Width="180" Content="Is DB Version lower than 10.2:"/>
                     <CheckBox VerticalAlignment="Center" Name="xOracleVersion"></CheckBox>
                 </StackPanel>
diff --git a/Ginger/Ginger/Variables/EditDatabasePage.xaml.cs b/Ginger/Ginger/Variables/EditDatabasePage.xaml.cs
index a0c7acd3b7..a7706b2e25 100644
--- a/Ginger/Ginger/Variables/EditDatabasePage.xaml.cs
+++ b/Ginger/Ginger/Variables/EditDatabasePage.xaml.cs
@@ -32,7 +32,8 @@ public EditDatabasePage(Database database, Context context)
             xDBAccEndPoint.Init(context, database, nameof(Database.User));
             xDBAccKey.Init(context, database, nameof(Database.Pass));
             xDatabaseConnectionString.Init(context, database, nameof(Database.ConnectionString));
-
+            xDatabaseConnectionString.Row.Height = new System.Windows.GridLength(100); 
+            xDatabaseConnectionString.ValueTextBox.Height = 40;
             ((DatabaseOperations)this.database.DatabaseOperations).NameBeforeEdit = this.database.Name;
 
             BindingHandler.ObjFieldBinding(xDatabaseName, TextBox.TextProperty, database, nameof(Database.Name));