diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs
index b8baec2..210106b 100644
--- a/WeeXnes/Core/Globals.cs
+++ b/WeeXnes/Core/Globals.cs
@@ -21,7 +21,8 @@ namespace WeeXnes.Core
         public static string apiUrl = "http://www.weexnes.com:5169/";
         
         public static UpdateVar<bool>   settings_alwaysOnTop                 = new UpdateVar<bool>();
-        
+        public static UpdateVar<bool>   settings_osxStyleControlls           = new UpdateVar<bool>();
+
         public static UpdateVar<bool>   settings_copySelectedToClipboard     = new UpdateVar<bool>(); 
         
         public static string            settings_KeyManagerItemsPath_Default = AppDataPath + "\\" + "Keys";
@@ -74,7 +75,7 @@ namespace WeeXnes.Core
                 Globals.settings_KeyManagerItemsPath.Value = Globals.settings_KeyManagerItemsPath_Default;
             }
             
-            
+            Globals.settings_osxStyleControlls.Value = Convert.ToBoolean(SettingsFile.GetValue("general", "OSXStyle"));
             
             Globals.settings_RpcShowElapsedTime.Value = Convert.ToBoolean(SettingsFile.GetValue("rpc", "RpcShowElapsedTime"));
             Globals.settings_RpcItemsPath_Bool.Value = Convert.ToBoolean(SettingsFile.GetValue("rpc", "RpcItemsPath_Bool"));
@@ -134,7 +135,10 @@ namespace WeeXnes.Core
                     SettingsFile.SetValue("KeyManager", "CensorKeys", "false");
                 }
             };
-            
+            Globals.settings_osxStyleControlls.ValueChanged += () =>
+            {
+                SettingsFile.SetValue("general", "OSXStyle", Globals.settings_osxStyleControlls.Value.ToString());
+            };
             
             Globals.settings_RpcItemsPath_Bool.ValueChanged += () =>
             {
diff --git a/WeeXnes/Images/green.png b/WeeXnes/Images/green.png
new file mode 100644
index 0000000..e20c542
Binary files /dev/null and b/WeeXnes/Images/green.png differ
diff --git a/WeeXnes/Images/red.png b/WeeXnes/Images/red.png
new file mode 100644
index 0000000..ab502dc
Binary files /dev/null and b/WeeXnes/Images/red.png differ
diff --git a/WeeXnes/Images/yellow.png b/WeeXnes/Images/yellow.png
new file mode 100644
index 0000000..606c3a8
Binary files /dev/null and b/WeeXnes/Images/yellow.png differ
diff --git a/WeeXnes/MVVM/View/SettingView.xaml b/WeeXnes/MVVM/View/SettingView.xaml
index 003b96d..7c2e162 100644
--- a/WeeXnes/MVVM/View/SettingView.xaml
+++ b/WeeXnes/MVVM/View/SettingView.xaml
@@ -43,6 +43,22 @@
                             VerticalAlignment="Center" 
                             FontSize="15" 
                             Foreground="White"/>
+                        
+                    </CheckBox>
+                    
+                    <CheckBox VerticalAlignment="Top"
+                              VerticalContentAlignment="Center"
+                              HorizontalContentAlignment="Center"
+                              Name="OSXSwitch"
+                              Checked="OSXSwitch_OnChecked"
+                              Unchecked="OSXSwitch_OnUnchecked"
+                              Margin="10,10,0,0">
+                        <TextBlock 
+                            Text="Enable OSX Style (Restart Required)" 
+                            VerticalAlignment="Center" 
+                            FontSize="15" 
+                            Foreground="White"/>
+                        
                     </CheckBox>
 
                 
diff --git a/WeeXnes/MVVM/View/SettingView.xaml.cs b/WeeXnes/MVVM/View/SettingView.xaml.cs
index 1406b59..181313b 100644
--- a/WeeXnes/MVVM/View/SettingView.xaml.cs
+++ b/WeeXnes/MVVM/View/SettingView.xaml.cs
@@ -64,6 +64,10 @@ namespace WeeXnes.MVVM.View
             {
                 AlwaysOnTopSwitch.IsChecked = true;
             }
+            if (Globals.settings_osxStyleControlls.Value)
+            {
+                OSXSwitch.IsChecked = true;
+            }
 
             if (Globals.settings_RpcAutoStart.Value)
             {
@@ -326,5 +330,15 @@ namespace WeeXnes.MVVM.View
         {
             Globals.settings_KeyManagerCensorKeys.Value = false;
         }
+
+        private void OSXSwitch_OnChecked(object sender, RoutedEventArgs e)
+        {
+            Globals.settings_osxStyleControlls.Value = true;
+        }
+
+        private void OSXSwitch_OnUnchecked(object sender, RoutedEventArgs e)
+        {
+            Globals.settings_osxStyleControlls.Value = false;
+        }
     }
 }
diff --git a/WeeXnes/MainWindow.xaml b/WeeXnes/MainWindow.xaml
index 740ab61..3d351f4 100644
--- a/WeeXnes/MainWindow.xaml
+++ b/WeeXnes/MainWindow.xaml
@@ -18,7 +18,11 @@
         Deactivated="Window_Deactivated"
         StateChanged="Window_StateChanged"
         Closing="Window_Closing">
-
+    <Window.Resources>
+        <Style TargetType="Image">
+            <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
+        </Style>
+    </Window.Resources>
     <Window.DataContext>
         <viewModel:MainViewModel/>
     </Window.DataContext>
@@ -122,7 +126,9 @@
                     VerticalAlignment="Top"
                     Margin="0,0,50,0"
                     Style="{StaticResource ModernMinimizeButton}"
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+                    IsEnabled="False"
+                    Visibility="Hidden"/>
             <Button Width="50"
                     Height="23"
                     Name="CloseBtn"
@@ -132,7 +138,31 @@
                     HorizontalAlignment="Right"
                     VerticalAlignment="Top"
                     Style="{StaticResource ModernCloseButton}"
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+                    Visibility="Hidden"/>
+            <DockPanel Grid.Column="1" Margin="0,5,5,5"
+                       Height="23"
+                       VerticalAlignment="Top"
+                       HorizontalAlignment="Right" Visibility="Hidden" Name="OSXControlls">
+                <Button Name="MinimizeButton" Width="20" BorderThickness="0" Background="Transparent"
+                        Style="{StaticResource OSXButtonStyle}" Click="MinimizeBtn_Click">
+                    <StackPanel>
+                        <Image Source="Images\green.png" Margin="1"/>
+                    </StackPanel>
+                </Button>
+                <Button Name="MaximizeButton" Width="20" BorderThickness="0" Background="Transparent"
+                        Style="{StaticResource OSXButtonStyle}">
+                    <StackPanel>
+                        <Image Source="Images\yellow.png" Margin="1"/>
+                    </StackPanel>
+                </Button>
+                <Button Name="CloseButton" Width="20" BorderThickness="0" Background="Transparent"
+                        Style="{StaticResource OSXButtonStyle}" Click="CloseBtn_Click">
+                    <StackPanel>
+                        <Image Source="Images\red.png" Margin="1"/>
+                    </StackPanel>
+                </Button>
+            </DockPanel>
 
             <ContentControl Grid.Row="1"
                             Grid.Column="1"
diff --git a/WeeXnes/MainWindow.xaml.cs b/WeeXnes/MainWindow.xaml.cs
index d005d5d..e1739db 100644
--- a/WeeXnes/MainWindow.xaml.cs
+++ b/WeeXnes/MainWindow.xaml.cs
@@ -101,7 +101,15 @@ namespace WeeXnes
         {
             //SettingView.CheckSetting();
             SettingsManager.start();
-            
+            if (Globals.settings_osxStyleControlls.Value)
+            {
+                OSXControlls.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                MinimizeBtn.Visibility = Visibility.Visible;
+                CloseBtn.Visibility = Visibility.Visible;
+            }
         }
 
         private void Border_MouseDown(object sender, MouseButtonEventArgs e)
diff --git a/WeeXnes/Theme/ControlButtonTheme.xaml b/WeeXnes/Theme/ControlButtonTheme.xaml
index b65e830..ec41277 100644
--- a/WeeXnes/Theme/ControlButtonTheme.xaml
+++ b/WeeXnes/Theme/ControlButtonTheme.xaml
@@ -76,4 +76,16 @@
             </Setter.Value>
         </Setter>
     </Style>
+    <Style x:Key="OSXButtonStyle" TargetType="Button">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj
index 0d97fb6..4c3d493 100644
--- a/WeeXnes/WeeXnes.csproj
+++ b/WeeXnes/WeeXnes.csproj
@@ -128,6 +128,9 @@
     </ItemGroup>
     <ItemGroup>
       <Content Include="Fonts\Poppins-Regular.ttf" />
+      <Resource Include="Images\green.png" />
+      <Resource Include="Images\red.png" />
+      <Resource Include="Images\yellow.png" />
       <Content Include="wicns.ico" />
       <Resource Include="Images\wicon.png" />
     </ItemGroup>