From c1cbe0cfa98bfa2dd51980ca9ca2725163f4da8d Mon Sep 17 00:00:00 2001
From: _Neo_ <ursamajorjanus2819@gmail.com>
Date: Sun, 18 Jan 2026 15:46:46 +0200
Subject: [PATCH] Fix Merge Error

---
 src/Ryujinx/UI/Windows/MainWindow.axaml | 26 ++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml b/src/Ryujinx/UI/Windows/MainWindow.axaml
index 37322a18e..b7385c9cb 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml
@@ -40,9 +40,9 @@
         <KeyBinding Gesture="F9" Command="{Binding ToggleDockMode}" />
         <KeyBinding Gesture="Escape" Command="{Binding ExitCurrentState}" />
         <KeyBinding Gesture="Ctrl+A" Command="{Binding OpenAmiiboWindow}" />
-        <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenAmiiboBinFile}" />
-        <KeyBinding Gesture="Ctrl+C" Command="{Binding OpenCheatManagerForCurrentApp}" />
-        <KeyBinding Gesture="Ctrl+M" Command="{Binding SimulateWakeUpMessage}" />
+        <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenBinFile}" />
+        <KeyBinding Gesture="Ctrl+Shift+R" Command="{Binding ReloadRenderDocApi}" />
+        <KeyBinding Gesture="Ctrl+Shift+C" Command="{Binding ToggleCapture}" />
     </Window.KeyBindings>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*">
         <helpers:OffscreenTextBox IsEnabled="False" Opacity="0" Name="HiddenTextBox" IsHitTestVisible="False" IsTabStop="False" />
@@ -107,12 +107,24 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     IsVisible="{Binding ShowLoadProgress}" ColumnDefinitions="Auto,*">
-                    <Image
-                        Margin="20"
+                    <Border
+                        Grid.RowSpan="2"
+                        Grid.Column="0"
                         Width="256"
                         Height="256"
-                        IsVisible="{Binding ShowLoadProgress}"
-                        Source="{Binding SelectedIcon, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
+                        Margin="10"
+                        Padding="4"
+                        BorderBrush="Black"
+                        BorderThickness="2"
+                        BoxShadow="4 4 32 8 #40000000"
+                        CornerRadius="3"
+                        IsVisible="{Binding ShowLoadProgress}">
+                        <Image
+                            Width="256"
+                            Height="256"
+                            IsVisible="{Binding ShowLoadProgress}"
+                            Source="{Binding SelectedIcon, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
+                    </Border>
                     <Grid
                         Grid.Column="1"
                         HorizontalAlignment="Stretch"