diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 3167a8c2..366325cd 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -1472,7 +1472,7 @@
                        Name="PART_searchTextBox"
                        Width="265" Height="28"
                        Margin="0,0,0,0"
-                       CornerRadius="2"
+                       CornerRadius="3"
                        Text="{Binding SearchPattern, RelativeSource={RelativeSource TemplatedParent}}">
                 <TextBox.InnerRightContent>
                   <StackPanel Orientation="Horizontal">
diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml
index 2b1b4957..a53cfbe1 100644
--- a/src/Views/AddRemote.axaml
+++ b/src/Views/AddRemote.axaml
@@ -27,7 +27,7 @@
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Remote.Name.Placeholder}"
                Text="{Binding Name, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
@@ -45,7 +45,7 @@
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Remote.URL.Placeholder}"
                Text="{Binding Url, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
diff --git a/src/Views/AddSubmodule.axaml b/src/Views/AddSubmodule.axaml
index 686a6dfc..c4281d3a 100644
--- a/src/Views/AddSubmodule.axaml
+++ b/src/Views/AddSubmodule.axaml
@@ -26,7 +26,7 @@
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.RepositoryURL}"
                Text="{Binding Url, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
@@ -48,7 +48,7 @@
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Submodule.RelativePath.Placeholder}"
                Text="{Binding RelativePath, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
diff --git a/src/Views/ChangeSubmoduleUrl.axaml b/src/Views/ChangeSubmoduleUrl.axaml
index 13ebbae0..a1d6cef0 100644
--- a/src/Views/ChangeSubmoduleUrl.axaml
+++ b/src/Views/ChangeSubmoduleUrl.axaml
@@ -35,7 +35,7 @@
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.RepositoryURL}"
                Text="{Binding Url, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
diff --git a/src/Views/ConventionalCommitMessageBuilder.axaml b/src/Views/ConventionalCommitMessageBuilder.axaml
index f0e1a44d..394901dc 100644
--- a/src/Views/ConventionalCommitMessageBuilder.axaml
+++ b/src/Views/ConventionalCommitMessageBuilder.axaml
@@ -87,7 +87,7 @@
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Optional}"
                Text="{Binding Scope, Mode=TwoWay}"/>
 
@@ -98,7 +98,7 @@
       <TextBox Grid.Row="2" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Text="{Binding Description, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="3" Grid.Column="0"
@@ -114,7 +114,7 @@
                ScrollViewer.VerticalScrollBarVisibility="Auto"
                VerticalAlignment="Center"
                VerticalContentAlignment="Top"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Optional}"
                Text="{Binding Detail, Mode=TwoWay}"/>
 
@@ -131,7 +131,7 @@
                ScrollViewer.VerticalScrollBarVisibility="Auto"
                VerticalAlignment="Center"
                VerticalContentAlignment="Top"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Optional}"
                Text="{Binding BreakingChanges, Mode=TwoWay}"/>
 
@@ -142,7 +142,7 @@
       <TextBox Grid.Row="5" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Optional}"
                Text="{Binding ClosedIssue, Mode=TwoWay}"/>
     </Grid>
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index c494adbf..fb9ece60 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -63,7 +63,7 @@
       <v:BranchOrTagNameTextBox Grid.Row="1" Grid.Column="1"
                                 Height="26"
                                 VerticalAlignment="Center"
-                                CornerRadius="2"
+                                CornerRadius="3"
                                 Text="{Binding Name, Mode=TwoWay}"
                                 Watermark="{DynamicResource Text.CreateBranch.Name.Placeholder}"/>
 
diff --git a/src/Views/CreateTag.axaml b/src/Views/CreateTag.axaml
index de53971e..113a76fe 100644
--- a/src/Views/CreateTag.axaml
+++ b/src/Views/CreateTag.axaml
@@ -51,7 +51,7 @@
       <v:BranchOrTagNameTextBox Grid.Row="1" Grid.Column="1"
                                 Height="26"
                                 VerticalAlignment="Center"
-                                CornerRadius="2"
+                                CornerRadius="3"
                                 Text="{Binding TagName, Mode=TwoWay}"
                                 Watermark="{DynamicResource Text.CreateTag.Name.Placeholder}"/>
 
@@ -76,7 +76,7 @@
                Height="64"
                AcceptsReturn="True" AcceptsTab="False"
                VerticalAlignment="Center" VerticalContentAlignment="Top"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.CreateTag.Message.Placeholder}"
                Text="{Binding Message, Mode=TwoWay}"
                IsVisible="{Binding Annotated}"
diff --git a/src/Views/EditRemote.axaml b/src/Views/EditRemote.axaml
index 2e2224c4..dd7fd34a 100644
--- a/src/Views/EditRemote.axaml
+++ b/src/Views/EditRemote.axaml
@@ -26,7 +26,7 @@
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Remote.Name.Placeholder}"
                Text="{Binding Name, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
@@ -44,7 +44,7 @@
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Remote.URL.Placeholder}"
                Text="{Binding Url, Mode=TwoWay}">
         <TextBox.InnerLeftContent>
diff --git a/src/Views/GitFlowStart.axaml b/src/Views/GitFlowStart.axaml
index 9c287f09..b9e7fdc9 100644
--- a/src/Views/GitFlowStart.axaml
+++ b/src/Views/GitFlowStart.axaml
@@ -35,7 +35,7 @@
       <TextBox Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.GitFlow.StartPlaceholder}"
                Text="{Binding Name, Mode=TwoWay}"/>
     </Grid>
diff --git a/src/Views/InitGitFlow.axaml b/src/Views/InitGitFlow.axaml
index 83415803..0460b4fb 100644
--- a/src/Views/InitGitFlow.axaml
+++ b/src/Views/InitGitFlow.axaml
@@ -25,7 +25,7 @@
       <TextBox Grid.Row="0" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Text="{Binding Master, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
@@ -35,7 +35,7 @@
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Text="{Binding Develop, Mode=TwoWay}"/>
 
       <Rectangle Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
@@ -50,7 +50,7 @@
       <TextBox Grid.Row="3" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Text="{Binding FeaturePrefix, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="4" Grid.Column="0"
@@ -60,7 +60,7 @@
       <TextBox Grid.Row="4" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Text="{Binding ReleasePrefix, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="5" Grid.Column="0"
@@ -70,7 +70,7 @@
       <TextBox Grid.Row="5" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Text="{Binding HotfixPrefix, Mode=TwoWay}"/>
 
       <TextBlock Grid.Row="6" Grid.Column="0"
@@ -80,7 +80,7 @@
       <TextBox Grid.Row="6" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Optional}"
                Text="{Binding TagPrefix, Mode=TwoWay}"/>
     </Grid>
diff --git a/src/Views/MoveSubmodule.axaml b/src/Views/MoveSubmodule.axaml
index 7d383966..bab30d12 100644
--- a/src/Views/MoveSubmodule.axaml
+++ b/src/Views/MoveSubmodule.axaml
@@ -34,7 +34,7 @@
       <TextBox Grid.Row="1" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.Submodule.RelativePath.Placeholder}"
                Text="{Binding MoveTo, Mode=TwoWay}"/>
     </Grid>
diff --git a/src/Views/RenameBranch.axaml b/src/Views/RenameBranch.axaml
index d193a5fd..bcc40534 100644
--- a/src/Views/RenameBranch.axaml
+++ b/src/Views/RenameBranch.axaml
@@ -35,7 +35,7 @@
       <v:BranchOrTagNameTextBox Grid.Row="1" Grid.Column="1"
                                 Height="26"
                                 VerticalAlignment="Center"
-                                CornerRadius="2"
+                                CornerRadius="3"
                                 Text="{Binding Name, Mode=TwoWay}"
                                 Watermark="{DynamicResource Text.RenameBranch.Name.Placeholder}"/>
     </Grid>
diff --git a/src/Views/SetSubmoduleBranch.axaml b/src/Views/SetSubmoduleBranch.axaml
index 2d5260e7..718fad7f 100644
--- a/src/Views/SetSubmoduleBranch.axaml
+++ b/src/Views/SetSubmoduleBranch.axaml
@@ -43,7 +43,7 @@
       <TextBox Grid.Row="2" Grid.Column="1"
                Height="26"
                VerticalAlignment="Center"
-               CornerRadius="2"
+               CornerRadius="3"
                Watermark="{DynamicResource Text.SetSubmoduleBranch.New.Tip}"
                Text="{Binding ChangeTo, Mode=TwoWay}"/>
     </Grid>