diff --git a/src/Views/Controls/ChangeStatusIcon.cs b/src/Views/Controls/ChangeStatusIcon.cs
index 8b306098..793f4c2e 100644
--- a/src/Views/Controls/ChangeStatusIcon.cs
+++ b/src/Views/Controls/ChangeStatusIcon.cs
@@ -8,6 +8,27 @@ namespace SourceGit.Views.Controls {
     ///     变更状态图标
     /// </summary>
     class ChangeStatusIcon : FrameworkElement {
+        public static readonly Brush[] Backgrounds = new Brush[] {
+            Brushes.Transparent,
+            new LinearGradientBrush(Color.FromRgb(238, 160, 14), Color.FromRgb(228, 172, 67), 90),
+            new LinearGradientBrush(Color.FromRgb(47, 185, 47), Color.FromRgb(75, 189, 75), 90),
+            new LinearGradientBrush(Colors.Tomato, Color.FromRgb(252, 165, 150), 90),
+            new LinearGradientBrush(Colors.Orchid, Color.FromRgb(248, 161, 245), 90),
+            new LinearGradientBrush(Color.FromRgb(238, 160, 14), Color.FromRgb(228, 172, 67), 90),
+            new LinearGradientBrush(Color.FromRgb(238, 160, 14), Color.FromRgb(228, 172, 67), 90),
+            new LinearGradientBrush(Color.FromRgb(47, 185, 47), Color.FromRgb(75, 189, 75), 90),
+        };
+
+        public static readonly string[] Labels = new string[] {
+            "?",
+            "±",
+            "+",
+            "−",
+            "➜",
+            "❏",
+            "U",
+            "★",
+        };
 
         public static readonly DependencyProperty ChangeProperty = DependencyProperty.Register(
             "Change",
@@ -62,12 +83,12 @@ namespace SourceGit.Views.Controls {
                     icon.background = Brushes.OrangeRed;
                     txt = "!";
                 } else {
-                    icon.background = GetBackground(icon.Change.WorkTree);
-                    txt = GetLabel(icon.Change.WorkTree);
+                    icon.background = Backgrounds[(int)icon.Change.WorkTree];
+                    txt = Labels[(int)icon.Change.WorkTree];
                 }
             } else {
-                icon.background = GetBackground(icon.Change.Index);
-                txt = GetLabel(icon.Change.Index);
+                icon.background = Backgrounds[(int)icon.Change.Index];
+                txt = Labels[(int)icon.Change.Index];
             }
 
             icon.label = new FormattedText(
@@ -81,31 +102,5 @@ namespace SourceGit.Views.Controls {
 
             icon.InvalidateVisual();
         }
-
-        private static Brush GetBackground(Models.Change.Status status) {
-            switch (status) {
-            case Models.Change.Status.Modified: return new LinearGradientBrush(Color.FromRgb(238, 160, 14), Color.FromRgb(228, 172, 67), 90);
-            case Models.Change.Status.Added: return new LinearGradientBrush(Color.FromRgb(47, 185, 47), Color.FromRgb(75, 189, 75), 90);
-            case Models.Change.Status.Deleted: return new LinearGradientBrush(Colors.Tomato, Color.FromRgb(252, 165, 150), 90);
-            case Models.Change.Status.Renamed: return new LinearGradientBrush(Colors.Orchid, Color.FromRgb(248, 161, 245), 90);
-            case Models.Change.Status.Copied: return new LinearGradientBrush(Color.FromRgb(238, 160, 14), Color.FromRgb(228, 172, 67), 90);
-            case Models.Change.Status.Unmerged: return new LinearGradientBrush(Color.FromRgb(238, 160, 14), Color.FromRgb(228, 172, 67), 90);
-            case Models.Change.Status.Untracked: return new LinearGradientBrush(Color.FromRgb(47, 185, 47), Color.FromRgb(75, 189, 75), 90);
-            default: return Brushes.Transparent;
-            }
-        }
-
-        private static string GetLabel(Models.Change.Status status) {
-            switch (status) {
-            case Models.Change.Status.Modified: return "±";
-            case Models.Change.Status.Added: return "+";
-            case Models.Change.Status.Deleted: return "−";
-            case Models.Change.Status.Renamed: return "➜";
-            case Models.Change.Status.Copied: return "❏";
-            case Models.Change.Status.Unmerged: return "U";
-            case Models.Change.Status.Untracked: return "★";
-            default: return "?";
-            }
-        }
     }
 }
diff --git a/src/Views/Widgets/CommitDetail.xaml b/src/Views/Widgets/CommitDetail.xaml
index c3d4fb8c..4f046c6b 100644
--- a/src/Views/Widgets/CommitDetail.xaml
+++ b/src/Views/Widgets/CommitDetail.xaml
@@ -170,6 +170,9 @@
                         BorderThickness="0"
                         TextWrapping="Wrap"
                         Margin="11,5,16,0"
+                        MaxHeight="80"
+                        HorizontalScrollBarVisibility="Disabled"
+                        VerticalScrollBarVisibility="Auto"
                         VerticalAlignment="Top"/>
                 </Grid>
 
@@ -193,7 +196,7 @@
                         Grid.Column="1"
                         x:Name="changeList"
                         RowHeight="24"
-                        Margin="11,0,0,2">
+                        Margin="11,0,16,2">
                         <DataGrid.RowStyle>
                             <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource Style.DataGridRow}">
                                 <EventSetter Event="ContextMenuOpening" Handler="OnChangeListContextMenuOpening"/>