diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 9d3486a1..6e6e9fb5 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -133,6 +133,14 @@ namespace SourceGit.ViewModels
             LoadDiffContent();
         }
 
+        public void ToggleHighlightedDiffNavigation()
+        {
+            Preference.Instance.EnableChangeBlocks = !Preference.Instance.EnableChangeBlocks;
+            if (_content is Models.TextDiff textDiff)
+                textDiff.CurrentChangeBlockIdx = -1;
+            RefreshChangeBlockIndicator();
+        }
+
         public void IncrUnified()
         {
             UnifiedLines = _unifiedLines + 1;
@@ -145,6 +153,12 @@ namespace SourceGit.ViewModels
             LoadDiffContent();
         }
 
+        public void ToggleTwoSideDiff()
+        {
+            Preference.Instance.UseSideBySideDiff = !Preference.Instance.UseSideBySideDiff;
+            RefreshChangeBlockIndicator();
+        }
+
         public void OpenExternalMergeTool()
         {
             var toolType = Preference.Instance.ExternalMergeToolType;
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
index 1ccee4cd..8d09272f 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@@ -206,6 +206,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _useFullTextDiff, value);
         }
 
+        public bool EnableChangeBlocks
+        {
+            get => _enableChangeBlocks;
+            set => SetProperty(ref _enableChangeBlocks, value);
+        }
+
         public Models.ChangeViewMode UnstagedChangeViewMode
         {
             get => _unstagedChangeViewMode;
@@ -614,6 +620,7 @@ namespace SourceGit.ViewModels
         private bool _enableDiffViewWordWrap = false;
         private bool _showHiddenSymbolsInDiffView = false;
         private bool _useFullTextDiff = false;
+        private bool _enableChangeBlocks = false;
 
         private Models.ChangeViewMode _unstagedChangeViewMode = Models.ChangeViewMode.List;
         private Models.ChangeViewMode _stagedChangeViewMode = Models.ChangeViewMode.List;
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index e904f4a4..bf7b0339 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -34,6 +34,15 @@
 
           <!-- Toolbar Buttons -->
           <StackPanel Grid.Column="3" Margin="8,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
+            <ToggleButton Classes="line_path"
+              Width="28"
+              Command="{Binding ToggleHighlightedDiffNavigation}"
+              IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=EnableChangeBlocks, Mode=OneWay}"
+              IsVisible="{Binding IsTextDiff}"
+              ToolTip.Tip="{DynamicResource Text.Diff.HighlightedDiffNavigation}">
+              <Path Width="13" Height="13" Data="{StaticResource Icons.Highlight}" Margin="0,3,0,0"/>
+            </ToggleButton>
+
             <Button Classes="icon_button"
                     Width="28"
                     Click="OnGotoPrevChange"
@@ -42,12 +51,17 @@
               <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
             </Button>
 
-            <TextBlock Classes="primary" 
-                       Margin="0,0,0,0" 
-                       Text="{Binding ChangeBlockIndicator}" 
-                       FontSize="11" 
-                       TextTrimming="CharacterEllipsis"
-                       IsVisible="{Binding IsTextDiff}"/>
+            <TextBlock Classes="primary"
+                       Margin="0,0,0,0"
+                       Text="{Binding ChangeBlockIndicator}"
+                       FontSize="11">
+              <TextBlock.IsVisible>
+                <MultiBinding Converter="{x:Static BoolConverters.And}">
+                  <Binding Path="IsTextDiff"/>
+                  <Binding Source="{x:Static vm:Preference.Instance}" Path="EnableChangeBlocks" Mode="OneWay"/>
+                </MultiBinding>
+              </TextBlock.IsVisible>
+            </TextBlock>
 
             <Button Classes="icon_button"
                     Width="28"
@@ -131,7 +145,8 @@
 
             <ToggleButton Classes="line_path"
                           Width="28" Height="18"
-                          IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=TwoWay}"
+                          Command="{Binding ToggleTwoSideDiff}"
+                          IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"
                           IsVisible="{Binding IsTextDiff}"
                           ToolTip.Tip="{DynamicResource Text.Diff.SideBySide}">
               <Path Width="12" Height="12" Data="{StaticResource Icons.LayoutHorizontal}" Margin="0,2,0,0"/>
diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs
index 7184ec44..705d71a6 100644
--- a/src/Views/DiffView.axaml.cs
+++ b/src/Views/DiffView.axaml.cs
@@ -13,28 +13,44 @@ namespace SourceGit.Views
 
         private void OnGotoPrevChange(object _, RoutedEventArgs e)
         {
-            var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
-            if (textDiff == null)
-                return;
+            if (ViewModels.Preference.Instance.EnableChangeBlocks)
+            {
+                if (DataContext is ViewModels.DiffContext diffCtx)
+                    diffCtx.PrevChange();
+            }
+            else
+            {
+                var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
+                if (textDiff == null)
+                    return;
 
-            textDiff.GotoPrevChange();
-            if (textDiff is SingleSideTextDiffPresenter presenter)
-                presenter.ForceSyncScrollOffset();
+                textDiff.GotoPrevChange();
+                if (textDiff is SingleSideTextDiffPresenter presenter)
+                    presenter.ForceSyncScrollOffset();
 
-            e.Handled = true;
+                e.Handled = true;
+            }
         }
 
         private void OnGotoNextChange(object _, RoutedEventArgs e)
         {
-            var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
-            if (textDiff == null)
-                return;
+            if (ViewModels.Preference.Instance.EnableChangeBlocks)
+            {
+                if (DataContext is ViewModels.DiffContext diffCtx)
+                    diffCtx.NextChange();
+            }
+            else
+            {
+                var textDiff = this.FindDescendantOfType<ThemedTextDiffPresenter>();
+                if (textDiff == null)
+                    return;
 
-            textDiff.GotoNextChange();
-            if (textDiff is SingleSideTextDiffPresenter presenter)
-                presenter.ForceSyncScrollOffset();
+                textDiff.GotoNextChange();
+                if (textDiff is SingleSideTextDiffPresenter presenter)
+                    presenter.ForceSyncScrollOffset();
 
-            e.Handled = true;
+                e.Handled = true;
+            }
         }
     }
 }
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 5ccd9281..b232134e 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -635,6 +635,7 @@ namespace SourceGit.Views
                 //TextArea.Caret.BringCaretToView(); // NOTE: Brings caret line (barely) into view.
                 ScrollToLine(changeBlock.StartLine); // NOTE: Brings specified line into center of view.
             }
+            TextArea.TextView.Redraw();
         }
 
         public override void Render(DrawingContext context)
@@ -712,6 +713,10 @@ namespace SourceGit.Views
             {
                 InvalidateVisual();
             }
+            else if (change.Property == CurrentChangeBlockIdxProperty)
+            {
+                InvalidateVisual();
+            }
         }
 
         private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e)
@@ -1587,7 +1592,7 @@ namespace SourceGit.Views
 
             CurrentChangeBlockIdxProperty.Changed.AddClassHandler<TextDiffView>((v, e) =>
             {
-                if ((int)e.NewValue >= 0 && v.Editor.Presenter != null)
+                if (v.Editor.Presenter != null)
                 {
                     foreach (var p in v.Editor.Presenter.GetVisualDescendants().OfType<ThemedTextDiffPresenter>())
                     {