From d1dc5d04e09f2368b68aaca423da257b7c2655dd Mon Sep 17 00:00:00 2001
From: oZ-Zo <50652175+oz-zo@users.noreply.github.com>
Date: Tue, 18 Feb 2020 16:08:52 +0300
Subject: [PATCH] Remove icons from toggle switch, change hamburger text icon
 to wpf path.

This change broken good design.
---
 .../Controls/HamburgerCategoryButton.xaml     |  27 ++++-
 .../Controls/HamburgerCategoryButton.xaml.cs  |  29 +++++
 .../HamburgerCategoryFlashButton.xaml         |  30 +++++-
 .../HamburgerCategoryFlashButton.xaml.cs      |  34 +++++-
 .../W10SS_GUI/Controls/ToggleSwitch.xaml      |   7 +-
 .../W10SS_GUI/Controls/ToggleSwitch.xaml.cs   |  18 ++--
 .../Controls/TogglesCategoryPanel.xaml        |  37 -------
 .../Controls/TogglesCategoryPanel.xaml.cs     |  44 --------
 W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml       |   8 +-
 W10SS_GUI_2/W10SS_GUI/MainWindow.xaml         | 101 ++++++++++--------
 .../W10SS_GUI/Properties/AssemblyInfo.cs      |   4 +-
 .../W10SS_GUI/Resource/controlsSize.xaml      |   2 +
 W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml     |  22 ++--
 W10SS_GUI_2/W10SS_GUI/Resource/tags.xaml      |   2 +-
 W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj        |  11 +-
 15 files changed, 202 insertions(+), 174 deletions(-)
 delete mode 100644 W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml
 delete mode 100644 W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml.cs

diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml
index 4df79b8e..1122559d 100644
--- a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml
+++ b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml
@@ -17,6 +17,16 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
+        <Style TargetType="Path">
+            <Style.Triggers>
+                <Trigger Property="IsEnabled" Value="True">
+                    <Setter Property="Fill" Value="{DynamicResource colorTextHamburgerForeground}" />
+                </Trigger>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="Fill" Value="{DynamicResource colorTextHamburgerForegroundDisabled}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
     </UserControl.Resources>
     <Grid>
         <StackPanel Name="hamburgerButton" 
@@ -56,10 +66,23 @@
             </StackPanel.Triggers>
 
             <StackPanel Name="hamburgerContainer" Orientation="Horizontal">
-                <TextBlock Name="textIcon" FontFamily="{StaticResource fontHamburgerCategoryButtonIcon}" FontSize="{DynamicResource  buttonHamburgerIconsSize}"                     
+                
+                <TextBlock Name="textIcon"                            
+                           FontFamily="{StaticResource fontHamburgerCategoryButtonIcon}" 
+                           FontSize="{DynamicResource  buttonHamburgerIconsSize}"                     
                            Margin="10 0 10 0" 
                            VerticalAlignment="Center"
-                           Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Icon}"/>
+                           Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Icon}"
+                           Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=IconVisibility}"/>
+
+                <Viewbox Width="24" 
+                         Height="24" 
+                         Margin="7 0 10 0"
+                         Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=ViewboxPathVisibility}">
+                    <Canvas Width="24" Height="24">
+                        <Path Data="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=ViewboxPathData}" />
+                    </Canvas>
+                </Viewbox>
 
                 <TextBlock Name="textCategory" FontSize="{DynamicResource textHamburgerSize}" 
                            Margin="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=TextMargin}"                           
diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml.cs b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml.cs
index 2c7319bb..a8538852 100644
--- a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml.cs
+++ b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryButton.xaml.cs
@@ -59,6 +59,35 @@ namespace W10SS_GUI.Controls
         // Using a DependencyProperty as the backing store for TextMargin.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty TextMarginProperty =
             DependencyProperty.Register("TextMargin", typeof(Thickness), typeof(HamburgerCategoryButton), new PropertyMetadata(default(Thickness)));
+               
+        public Visibility IconVisibility
+        {
+            get { return (Visibility)GetValue(IconVisibilityProperty); }
+            set { SetValue(IconVisibilityProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for IconVisibility.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty IconVisibilityProperty =
+            DependencyProperty.Register("IconVisibility", typeof(Visibility), typeof(HamburgerCategoryButton), new PropertyMetadata(default(Visibility)));
+
+        public Geometry ViewboxPathData
+        {
+            get { return (Geometry)GetValue(ViewboxPathDataProperty); }
+            set { SetValue(ViewboxPathDataProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for ViewboxPathData.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ViewboxPathDataProperty =
+            DependencyProperty.Register("ViewboxPathData", typeof(Geometry), typeof(HamburgerCategoryButton), new PropertyMetadata(default(Geometry)));
+
+        public Visibility ViewboxPathVisibility
+        {
+            get { return (Visibility)GetValue(ViewboxPathVisibilityProperty); }
+            set { SetValue(ViewboxPathVisibilityProperty, value); }
+        }
 
+        // Using a DependencyProperty as the backing store for ViewboxPathVisibility.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ViewboxPathVisibilityProperty =
+            DependencyProperty.Register("ViewboxPathVisibility", typeof(Visibility), typeof(HamburgerCategoryButton), new PropertyMetadata(default(Visibility)));
     }
 }
diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml
index a117b069..c8d9bd76 100644
--- a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml
+++ b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml
@@ -17,6 +17,16 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
+        <Style TargetType="Path">
+            <Style.Triggers>
+                <Trigger Property="IsEnabled" Value="True">
+                    <Setter Property="Fill" Value="{DynamicResource colorTextHamburgerForeground}" />
+                </Trigger>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="Fill" Value="{DynamicResource colorTextHamburgerForegroundDisabled}"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
     </UserControl.Resources>
     <Grid Tag="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Tag}">
         <StackPanel Name="hamburgerButton"
@@ -38,8 +48,7 @@
                             <Trigger.EnterActions>
                                 <PauseStoryboard BeginStoryboardName="animationHamburgerIsEnabled" />
                                 <BeginStoryboard Name="animationHamburgerIsDisabled" Storyboard="{DynamicResource animationHamburgerApplyButtonIsDisabled}"/>
-                            </Trigger.EnterActions>
-                            
+                            </Trigger.EnterActions>                            
                         </Trigger>                        
                     </Style.Triggers>
                 </Style>
@@ -67,10 +76,23 @@
             </StackPanel.Triggers>
 
             <StackPanel Name="hamburgerContainer" Orientation="Horizontal">
-                <TextBlock Name="textIcon" FontFamily="{StaticResource fontHamburgerCategoryFlashButtonIcon}" FontSize="{DynamicResource  buttonHamburgerIconsSize}"                     
+                
+                <TextBlock Name="textIcon" 
+                           FontFamily="{StaticResource fontHamburgerCategoryFlashButtonIcon}" 
+                           FontSize="{DynamicResource  buttonHamburgerIconsSize}"                     
                            Margin="10 0 10 0" 
                            VerticalAlignment="Center"
-                           Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Icon}"/>
+                           Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Icon}"
+                           Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=IconVisibility}"/>
+
+                <Viewbox Width="24" 
+                         Height="24" 
+                         Margin="7 0 10 0"
+                         Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=ViewboxPathVisibility}">
+                    <Canvas Width="24" Height="24">
+                        <Path Data="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=ViewboxPathData}" />
+                    </Canvas>
+                </Viewbox>
 
                 <TextBlock Name="textCategory" FontSize="{DynamicResource textHamburgerSize}" 
                            Margin="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=TextMargin}"                           
diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml.cs b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml.cs
index e5f86c56..9256b18c 100644
--- a/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml.cs
+++ b/W10SS_GUI_2/W10SS_GUI/Controls/HamburgerCategoryFlashButton.xaml.cs
@@ -35,7 +35,6 @@ namespace W10SS_GUI.Controls
         public static readonly DependencyProperty TextProperty =
             DependencyProperty.Register("Text", typeof(string), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(string)));
 
-
         public string Icon
         {
             get { return (string)GetValue(IconProperty); }
@@ -46,8 +45,6 @@ namespace W10SS_GUI.Controls
         public static readonly DependencyProperty IconProperty =
             DependencyProperty.Register("Icon", typeof(string), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(string)));
 
-
-
         public Thickness TextMargin
         {
             get { return (Thickness)GetValue(TextMarginProperty); }
@@ -56,6 +53,35 @@ namespace W10SS_GUI.Controls
 
         // Using a DependencyProperty as the backing store for TextMargin.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty TextMarginProperty =
-            DependencyProperty.Register("TextMargin", typeof(Thickness), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(Thickness)));        
+            DependencyProperty.Register("TextMargin", typeof(Thickness), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(Thickness)));
+        public Visibility IconVisibility
+        {
+            get { return (Visibility)GetValue(IconVisibilityProperty); }
+            set { SetValue(IconVisibilityProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for IconVisibility.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty IconVisibilityProperty =
+            DependencyProperty.Register("IconVisibility", typeof(Visibility), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(Visibility)));
+
+        public Geometry ViewboxPathData
+        {
+            get { return (Geometry)GetValue(ViewboxPathDataProperty); }
+            set { SetValue(ViewboxPathDataProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for ViewboxPathData.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ViewboxPathDataProperty =
+            DependencyProperty.Register("ViewboxPathData", typeof(Geometry), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(Geometry)));
+
+        public Visibility ViewboxPathVisibility
+        {
+            get { return (Visibility)GetValue(ViewboxPathVisibilityProperty); }
+            set { SetValue(ViewboxPathVisibilityProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for ViewboxPathVisibility.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ViewboxPathVisibilityProperty =
+            DependencyProperty.Register("ViewboxPathVisibility", typeof(Visibility), typeof(HamburgerCategoryFlashButton), new PropertyMetadata(default(Visibility)));
     }
 }
diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml b/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml
index 5f40e0a2..820fd99f 100644
--- a/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml
+++ b/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml
@@ -185,18 +185,19 @@
           MouseEnter="GridToggleSwitch_MouseEnter" MouseLeave="GridToggleSwitch_MouseLeave"
           >                   
 
-        <TextBlock Name="iconToggleSwitch" 
+        <!--<TextBlock Name="iconToggleSwitch" 
                    FontFamily="{StaticResource fontToggleIcon}"
                    Width="{StaticResource toggleSwitchIconsWidth}"
                    FontSize="{DynamicResource toggleSwitchIconsFontSize}"
                    Margin="10 0 5 0"
                    VerticalAlignment="Center"
                    HorizontalAlignment="Left"
-                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Icon}"/>
+                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Icon}"/>-->
 
         <StackPanel VerticalAlignment="Center" 
                     HorizontalAlignment="Left"
-                    Margin="45 5 60 5">
+                    Margin="10 5 60 5">
+                    <!--Margin="45 5 60 5">-->
         
             <TextBlock Name="textToggleSwitchHeader" 
                        FontFamily="{StaticResource fontToggleSwitchHeader}"                                      
diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml.cs b/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml.cs
index 942b0787..6c4a7a10 100644
--- a/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml.cs
+++ b/W10SS_GUI_2/W10SS_GUI/Controls/ToggleSwitch.xaml.cs
@@ -38,15 +38,15 @@ namespace W10SS_GUI.Controls
         public static readonly DependencyProperty IsCheckedProperty =
             DependencyProperty.Register("IsChecked", typeof(bool), typeof(ToggleSwitch), new PropertyMetadata(default(bool)));
 
-        public string Icon
-        {
-            get { return (string)GetValue(IconProperty); }
-            set { SetValue(IconProperty, value); }
-        }
-
-        // Using a DependencyProperty as the backing store for Icon.  This enables animation, styling, binding, etc...
-        public static readonly DependencyProperty IconProperty =
-            DependencyProperty.Register("Icon", typeof(string), typeof(ToggleSwitch), new PropertyMetadata(default(string)));
+        //public string Icon
+        //{
+        //    get { return (string)GetValue(IconProperty); }
+        //    set { SetValue(IconProperty, value); }
+        //}
+
+        //// Using a DependencyProperty as the backing store for Icon.  This enables animation, styling, binding, etc...
+        //public static readonly DependencyProperty IconProperty =
+        //    DependencyProperty.Register("Icon", typeof(string), typeof(ToggleSwitch), new PropertyMetadata(default(string)));
 
         public string Header
         {
diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml b/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml
deleted file mode 100644
index 3fd8a202..00000000
--- a/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml
+++ /dev/null
@@ -1,37 +0,0 @@
-<UserControl x:Class="W10SS_GUI.Controls.TogglesCategoryPanel"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:W10SS_GUI.Controls"
-             mc:Ignorable="d"             
-             Name="togglesCategoryPanel">
-    
-    <StackPanel Name="panelTogglesCategory"
-                Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Width}"
-                Tag="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=Tag}"
-                Orientation="Vertical"
-                Background="{DynamicResource colorWindowBackground}">                
-        
-        <StackPanel Name="panelTogglesHeader"
-                    Height="{StaticResource togglesCategoryPanelHeaderHeight}"
-                    Orientation="Horizontal">
-
-            <TextBlock Name="textTogglesHeader" 
-                       FontSize="{StaticResource togglesCategoryPanelHeaderFontSize}"
-                       FontFamily="{StaticResource fontTogglesPanelHeader}"
-                       Margin="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=HeaderMargin}"                           
-                       VerticalAlignment="Center"
-                       Text="{DynamicResource textHamburgerPrivacy}"/>
-        </StackPanel>
-
-        <ScrollViewer Name="scrollTogglesCategory"
-                          HorizontalScrollBarVisibility="Disabled"
-                          VerticalScrollBarVisibility="Auto">
-
-            <StackPanel Name="Context" Orientation="Vertical" Margin="20" />            
-
-        </ScrollViewer>
-
-    </StackPanel>
-</UserControl>
diff --git a/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml.cs b/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml.cs
deleted file mode 100644
index 05326f45..00000000
--- a/W10SS_GUI_2/W10SS_GUI/Controls/TogglesCategoryPanel.xaml.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace W10SS_GUI.Controls
-{
-    /// <summary>
-    /// Логика взаимодействия для TogglesCategoryPanel.xaml
-    /// </summary>
-    
-    public partial class TogglesCategoryPanel : UserControl
-    {
-        public TogglesCategoryPanel()
-        {
-            InitializeComponent();
-        }
-
-
-
-        public Thickness HeaderMargin
-        {
-            get { return (Thickness)GetValue(HeaderMarginProperty); }
-            set { SetValue(HeaderMarginProperty, value); }
-        }
-
-        // Using a DependencyProperty as the backing store for HeaderMargin.  This enables animation, styling, binding, etc...
-        public static readonly DependencyProperty HeaderMarginProperty =
-            DependencyProperty.Register("HeaderMargin", typeof(Thickness), typeof(TogglesCategoryPanel), new PropertyMetadata(default(Thickness)));
-        
-    }
-}
diff --git a/W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml b/W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml
index ec65ee91..0ba86ab8 100644
--- a/W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml
+++ b/W10SS_GUI_2/W10SS_GUI/Localized/EN.xaml
@@ -9,15 +9,15 @@
     <system:String x:Key="textHamburgerSystem">System</system:String>
     <system:String x:Key="textHamburgerStartMenu">Start Menu</system:String>
     <system:String x:Key="textHamburgerUwp">UWP Apps</system:String>
-    <system:String x:Key="textHamburgerWinGame">Windows Game</system:String>
+    <system:String x:Key="textHamburgerWinGame">Game Mode</system:String>
     <system:String x:Key="textHamburgerTaskScheduler">Task Scheduler</system:String>
     <system:String x:Key="textHamburgerDefender">Microsoft Defender</system:String>
     <system:String x:Key="textHamburgerContextMenu">Context Menu</system:String>
     
     <system:String x:Key="textHamburgerApply">Apply Settings</system:String>
     <system:String x:Key="textHamburgerSave">Save Settings</system:String>
-    <system:String x:Key="textHamburgerLoad">Load Settings</system:String>
-    <system:String x:Key="textHamburgerLanguage">Change Language</system:String>
-    <system:String x:Key="textHamburgerOpenGithub">Follow to GitHub</system:String>
+    <system:String x:Key="textHamburgerLoad">Import Settings</system:String>
+    <system:String x:Key="textHamburgerLanguage">Русский</system:String>
+    <system:String x:Key="textHamburgerOpenGithub">GitHub</system:String>
     
 </ResourceDictionary>
\ No newline at end of file
diff --git a/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml b/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml
index e151820f..b2ad3699 100644
--- a/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml
+++ b/W10SS_GUI_2/W10SS_GUI/MainWindow.xaml
@@ -8,9 +8,10 @@
         mc:Ignorable="d"
         Name="Window" Title="{StaticResource textWindowTitle}"         
         MinHeight="{StaticResource windowMinHeight}"
-        MinWidth="{StaticResource windowMinWidth}"
-        Height="{StaticResource windowHeight}"        
+        Height="{StaticResource windowHeight}"            
+        MinWidth="{StaticResource windowMinWidth}"        
         Width="{StaticResource windowWidth}" 
+        MaxWidth="{StaticResource windowMaxWidth}"
         FontFamily="{StaticResource fontWindow}"
         FontSize="{DynamicResource windowFontSize}"         
         WindowStartupLocation="CenterScreen" 
@@ -19,7 +20,9 @@
         ShowInTaskbar="True"
         Background="{DynamicResource colorWindowBackground}"
         Foreground="{DynamicResource colorWindowForeground}"         
-        Initialized="Window_Initialized" SizeToContent="Manual">
+        Initialized="Window_Initialized" 
+        Icon="windows10.ico"
+        SizeToContent="Manual">
     <Window.Style>
         <Style TargetType="{x:Type Window}">
             <Setter Property="TextOptions.TextFormattingMode" Value="Display"/>
@@ -32,11 +35,11 @@
         <!--#region Hamburger Panel-->
         <Canvas Name="panelHamburger"                
                 MinWidth="{StaticResource panelHamburgerMinWidth}" 
-                Width="{StaticResource panelHamburgerMinWidth}" 
+                Width="{StaticResource panelHamburgerMinWidth}"
                 MaxWidth="{StaticResource panelHamburgerMaxWidth}" 
                 Background="{DynamicResource colorButtonHamburgerBackground}"
                 HorizontalAlignment="Left"
-                Panel.ZIndex="10">
+                Panel.ZIndex="10">            
             <Canvas.Effect>
                 <DropShadowEffect Direction="380" BlurRadius="10" Opacity="0.6"/>
             </Canvas.Effect>
@@ -55,6 +58,7 @@
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 3"
                                         Tag="{StaticResource tagCategoryPrivacy}"
+                                        ViewboxPathVisibility="Collapsed"
                                         Canvas.Top="0" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerUi"
@@ -63,15 +67,17 @@
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 -2"
                                         Tag="{StaticResource tagCategoryUi}"
+                                        ViewboxPathVisibility="Collapsed"
                                         Canvas.Top="40" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerOneDrive"
-                                        Icon="{StaticResource iconHamburgerOneDrive}" 
+                                        IconVisibility="Collapsed"
+                                        ViewboxPathData="{StaticResource iconHamburgerOneDrive}"
                                         Text="{DynamicResource textHamburgerOneDrive}" 
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 3"
                                         Tag="{StaticResource tagCategoryOneDrive}"
-                                        Canvas.Top="80" Canvas.Left="0"/>
+                                        Canvas.Top="80" Canvas.Left="0" />
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerSystem"
                                         Icon="{StaticResource iconHamburgerSystem}" 
@@ -79,6 +85,7 @@
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 1"
                                         Tag="{StaticResource tagCategorySystem}"
+                                        ViewboxPathVisibility="Collapsed"
                                         Canvas.Top="120" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerStartMenu"
@@ -87,6 +94,7 @@
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 5"
                                         Tag="{StaticResource tagCategoryStartMenu}"
+                                        ViewboxPathVisibility="Collapsed"
                                         Canvas.Top="160" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerUwp"
@@ -95,17 +103,21 @@
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 1"
                                         Tag="{StaticResource tagCategoryUwp}"
+                                        ViewboxPathVisibility="Collapsed"
                                         Canvas.Top="200" Canvas.Left="0" />
 
-            <uc:HamburgerCategoryButton Icon="{StaticResource iconHamburgerWinGame}" 
+            <uc:HamburgerCategoryButton x:Name="buttonHamburgerWinGame"
+                                        IconVisibility="Collapsed"
+                                        ViewboxPathData="{StaticResource iconHamburgerWinGame}"
                                         Text="{DynamicResource textHamburgerWinGame}" 
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 4"
-                                        Tag="{StaticResource tagCategoryWinGame}"
+                                        Tag="{StaticResource tagCategoryWinGame}"                                        
                                         Canvas.Top="240" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerTaskScheduler"
-                                        Icon="{StaticResource iconHamburgerTaskScheduler}" 
+                                        IconVisibility="Collapsed"
+                                        ViewboxPathData="{StaticResource iconHamburgerTaskScheduler}"
                                         Text="{DynamicResource textHamburgerTaskScheduler}" 
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 2"
@@ -118,6 +130,7 @@
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 4"
                                         Tag="{StaticResource tagCategoryDefender}"
+                                        ViewboxPathVisibility="Collapsed"
                                         Canvas.Top="320" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerContextMenu"
@@ -126,11 +139,13 @@
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 3"
                                         Tag="{StaticResource tagCategoryContextMenu}"
+                                        ViewboxPathVisibility="Collapsed"
                                         Canvas.Top="360" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryFlashButton x:Name="buttonHamburgerApplySettings"
                                              IsEnabled="False"
-                                             Icon="{StaticResource iconHamburgerApplySettings}"
+                                             IconVisibility="Collapsed"
+                                             ViewboxPathData="{StaticResource iconHamburgerApplySettings}"
                                              Text="{DynamicResource textHamburgerApply}" 
                                              Width="{Binding ElementName=panelHamburger, Path=Width}"
                                              TextMargin="0 0 10 1"                                             
@@ -138,28 +153,32 @@
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerSaveSettings"
                                         IsEnabled="False"
-                                        Icon="{StaticResource iconHamburgerSaveSettings}" 
+                                        IconVisibility="Collapsed"
+                                        ViewboxPathData="{StaticResource iconHamburgerSaveSettings}"
                                         Text="{DynamicResource textHamburgerSave}" 
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 3"
                                         Canvas.Bottom="40" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerLoadSettings"                                        
-                                        Icon="{StaticResource iconHamburgerLoadSettings}" 
+                                        IconVisibility="Collapsed"
+                                        ViewboxPathData="{StaticResource iconHamburgerLoadSettings}"
                                         Text="{DynamicResource textHamburgerLoad}" 
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 3"
                                         Canvas.Bottom="80" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerLanguageSettings"                                        
-                                        Icon="{StaticResource iconHamburgerLanguageSettings}" 
+                                        IconVisibility="Collapsed"
+                                        ViewboxPathData="{StaticResource iconHamburgerLanguageSettings}"
                                         Text="{DynamicResource textHamburgerLanguage}" 
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 3"
                                         Canvas.Bottom="160" Canvas.Left="0"/>
 
             <uc:HamburgerCategoryButton x:Name="buttonHamburgerOpenGithub"                                        
-                                        Icon="{StaticResource iconHamburgerOpenGithub}" 
+                                        IconVisibility="Collapsed"
+                                        ViewboxPathData="{StaticResource iconHamburgerOpenGithub}"
                                         Text="{DynamicResource textHamburgerOpenGithub}" 
                                         Width="{Binding ElementName=panelHamburger, Path=Width}"
                                         TextMargin="0 0 10 3"
@@ -176,17 +195,18 @@
                     VerticalAlignment="Top"
                     Margin="40 0 0 0">
             
-            <TextBlock Name="iconTogglesHeader"
+            <!--<TextBlock Name="iconTogglesHeader"
                        FontSize="{StaticResource iconTogglesCategoryPanelHeaderFontSize}"
                        FontFamily="{StaticResource fontToggleIcon}"
                            Margin="15 5 10 5"                       
-                           Text="{StaticResource iconHamburgerPrivacy}"/>
+                           Text="{StaticResource iconHamburgerPrivacy}"/>-->
 
             <TextBlock Name="textTogglesHeader" 
-                           FontSize="{StaticResource fontSizeTogglesCategoryPanelHeader}"
-                           FontFamily="{StaticResource fontTogglesPanelHeader}"
-                           VerticalAlignment="Center"
-                           Text="{DynamicResource textHamburgerPrivacy}"/>
+                       FontSize="{StaticResource fontSizeTogglesCategoryPanelHeader}"
+                       FontFamily="{StaticResource fontTogglesPanelHeader}"
+                       VerticalAlignment="Center"
+                       Margin="15 5 0 5"
+                       Text="{DynamicResource textHamburgerPrivacy}"/>
 
         </StackPanel>
 
@@ -201,64 +221,53 @@
 
             <StackPanel Name="panelTogglesCategoryContainer">
 
-                <StackPanel Name="paneTogglesCategoryPrivacy"
+                <StackPanel Name="panelTogglesCategoryPrivacy"
                             Tag="{StaticResource tagCategoryPrivacy}">
-                
-                <uc:ToggleSwitch Icon="&#xE196;"
+
+                    <uc:ToggleSwitch 
                                  Header="Change Windows Feedback frequency to Never"
                                  Description="Изменить частоту формирования отзывов на Никогда" />
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE192;" 
+                    <uc:ToggleSwitch 
                             Header="Do not allow apps to use advertising ID" 
                             Description="Не разрешать приложениям использовать идентификатор рекламы"/>
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE70C;"
+                    <uc:ToggleSwitch 
                             Header="Do not let apps on other devices open and message apps on this device, and vice versa"
                             Description="Не разрешать приложениям на других устройствах запускать приложения и отправлять сообщения на этом устройстве и наоборот"/>
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE909;"
+                    <uc:ToggleSwitch 
                             Header="Do not let websites provide locally relevant content by accessing language list"
                             Description="Не позволять веб-сайтам предоставлять местную информацию за счет доступа к списку языков"/>
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE196;"
+                    <uc:ToggleSwitch 
                             Header="Change Windows Feedback frequency to Never"
                             Description="Изменить частоту формирования отзывов на Никогда" />
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE192;" 
+                    <uc:ToggleSwitch  
                             Header="Do not allow apps to use advertising ID" 
                             Description="Не разрешать приложениям использовать идентификатор рекламы"/>
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE70C;"
+                    <uc:ToggleSwitch 
                             Header="Do not let apps on other devices open and message apps on this device, and vice versa"
                             Description="Не разрешать приложениям на других устройствах запускать приложения и отправлять сообщения на этом устройстве и наоборот"/>
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE909;"
+                    <uc:ToggleSwitch 
                             Header="Do not let websites provide locally relevant content by accessing language list"
                             Description="Не позволять веб-сайтам предоставлять местную информацию за счет доступа к списку языков"/>
-                <uc:ToggleSwitch 
-                            Icon="&#xE196;"
+                    <uc:ToggleSwitch 
                             Header="Change Windows Feedback frequency to Never"
                             Description="Изменить частоту формирования отзывов на Никогда" />
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE192;" 
+                    <uc:ToggleSwitch 
                             Header="Do not allow apps to use advertising ID" 
                             Description="Не разрешать приложениям использовать идентификатор рекламы"/>
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE70C;"
+                    <uc:ToggleSwitch 
                             Header="Do not let apps on other devices open and message apps on this device, and vice versa"
                             Description="Не разрешать приложениям на других устройствах запускать приложения и отправлять сообщения на этом устройстве и наоборот"/>
 
-                <uc:ToggleSwitch 
-                            Icon="&#xE909;"
+                    <uc:ToggleSwitch 
                             Header="Do not let websites provide locally relevant content by accessing language list"
                             Description="Не позволять веб-сайтам предоставлять местную информацию за счет доступа к списку языков"/>
                 </StackPanel>
diff --git a/W10SS_GUI_2/W10SS_GUI/Properties/AssemblyInfo.cs b/W10SS_GUI_2/W10SS_GUI/Properties/AssemblyInfo.cs
index 839d9337..3cb59ec3 100644
--- a/W10SS_GUI_2/W10SS_GUI/Properties/AssemblyInfo.cs
+++ b/W10SS_GUI_2/W10SS_GUI/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@ using System.Windows;
 // Общие сведения об этой сборке предоставляются следующим набором
 // набора атрибутов. Измените значения этих атрибутов, чтобы изменить сведения,
 // связанные со сборкой.
-[assembly: AssemblyTitle("W10SS_GUI")]
+[assembly: AssemblyTitle("Windows 10 Setup Script Gui")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("W10SS_GUI")]
+[assembly: AssemblyProduct("Windows 10 Setup Script Gui")]
 [assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml
index 046a5a95..a060f7df 100644
--- a/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml
+++ b/W10SS_GUI_2/W10SS_GUI/Resource/controlsSize.xaml
@@ -2,10 +2,12 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
                     xmlns:local="clr-namespace:W10SS_GUI.Controls">
+    
     <system:Double x:Key="windowMinHeight">885</system:Double>
     <system:Double x:Key="windowHeight">885</system:Double>
     <system:Double x:Key="windowMinWidth">645</system:Double>
     <system:Double x:Key="windowWidth">645</system:Double>
+    <system:Double x:Key="windowMaxWidth">1250</system:Double>
     <system:Double x:Key="windowFontSize">18</system:Double>
 
     <system:Double x:Key="buttonHamburgerWidth">40</system:Double>    
diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml
index 0d8ac1d2..f518a004 100644
--- a/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml
+++ b/W10SS_GUI_2/W10SS_GUI/Resource/icons.xaml
@@ -1,20 +1,20 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    xmlns:local="clr-namespace:W10SS_GUI.Resource">
+                    xmlns:system="clr-namespace:System;assembly=mscorlib"                    
+                    xmlns:local="clr-namespace:W10SS_GUI.Resource">    
     <system:String x:Key="iconHamburgerPrivacy">&#xF103;</system:String>
     <system:String x:Key="iconHamburgerUi">&#xE771;</system:String>
-    <system:String x:Key="iconHamburgerOneDrive">&#xE753;</system:String>
+    <Geometry x:Key="iconHamburgerOneDrive">M18.21 10.29Q19 10.34 19.7 10.68 20.39 11 20.9 11.57 21.41 12.12 21.71 12.83 22 13.54 22 14.34 22 15.18 21.68 15.92 21.36 16.66 20.8 17.21 20.25 17.76 19.5 18.08 18.78 18.41 17.94 18.41H7Q5.97 18.41 5.06 18 4.15 17.61 3.47 16.94 2.79 16.26 2.4 15.35 2 14.44 2 13.41 2 12.59 2.26 11.83 2.5 11.08 3 10.45 3.44 9.82 4.08 9.35 4.72 8.88 5.5 8.63 5.87 8.5 6.21 8.5 6.56 8.43 6.93 8.41H6.94Q7.37 7.75 7.95 7.23 8.5 6.71 9.2 6.34 9.87 6 10.62 5.78 11.37 5.59 12.16 5.59 13.22 5.59 14.2 5.94 15.18 6.29 16 6.91 16.8 7.53 17.37 8.39 17.95 9.26 18.21 10.29M12.16 6.84Q11.05 6.84 10.06 7.3 9.06 7.75 8.36 8.6 8.73 8.7 9.07 8.85 9.4 9 9.73 9.2L13.71 11.58L16 10.62Q16.21 10.53 16.44 10.45 16.67 10.38 16.92 10.33 16.68 9.55 16.21 8.91 15.74 8.27 15.11 7.81 14.5 7.35 13.73 7.1 13 6.84 12.16 6.84M4 15.66L12.27 12.18L9.08 10.26Q8.59 9.97 8.06 9.81 7.5 9.66 6.95 9.66 6.19 9.66 5.5 9.96 4.84 10.26 4.34 10.77 3.84 11.29 3.54 11.97 3.25 12.65 3.25 13.41 3.25 14 3.45 14.59 3.64 15.19 4 15.66M17.94 17.16Q18.41 17.16 18.84 17 19.27 16.86 19.64 16.58L13.61 13L5.03 16.59Q5.47 16.86 5.97 17 6.47 17.16 7 17.16M20.45 15.61Q20.75 15 20.75 14.34 20.75 13.7 20.5 13.17 20.26 12.65 19.85 12.28 19.43 11.91 18.88 11.71 18.32 11.5 17.7 11.5 17.35 11.5 17 11.6 16.66 11.68 16.33 11.81 16 11.93 15.67 12.08 15.35 12.23 15.04 12.37Z</Geometry>
     <system:String x:Key="iconHamburgerSystem">&#xE770;</system:String>
     <system:String x:Key="iconHamburgerStartMenu">&#xECA5;</system:String>
-    <system:String x:Key="iconHamburgerUwp">&#xE8D9;</system:String>
-    <system:String x:Key="iconHamburgerWinGame">&#xE7FC;</system:String>
-    <system:String x:Key="iconHamburgerTaskScheduler">&#xE823;</system:String>
+    <system:String x:Key="iconHamburgerUwp">&#xECAA;</system:String>
+    <Geometry x:Key="iconHamburgerWinGame">M7,6H17A6,6 0 0,1 23,12A6,6 0 0,1 17,18C15.22,18 13.63,17.23 12.53,16H11.47C10.37,17.23 8.78,18 7,18A6,6 0 0,1 1,12A6,6 0 0,1 7,6M6,9V11H4V13H6V15H8V13H10V11H8V9H6M15.5,12A1.5,1.5 0 0,0 14,13.5A1.5,1.5 0 0,0 15.5,15A1.5,1.5 0 0,0 17,13.5A1.5,1.5 0 0,0 15.5,12M18.5,9A1.5,1.5 0 0,0 17,10.5A1.5,1.5 0 0,0 18.5,12A1.5,1.5 0 0,0 20,10.5A1.5,1.5 0 0,0 18.5,9Z</Geometry>
+    <Geometry x:Key="iconHamburgerTaskScheduler">M12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22C6.47,22 2,17.5 2,12A10,10 0 0,1 12,2M12.5,7V12.25L17,14.92L16.25,16.15L11,13V7H12.5Z</Geometry>    
     <system:String x:Key="iconHamburgerDefender">&#xE83D;</system:String>
     <system:String x:Key="iconHamburgerContextMenu">&#xE292;</system:String>
-    <system:String x:Key="iconHamburgerApplySettings">&#xE713;</system:String>
-    <system:String x:Key="iconHamburgerSaveSettings">&#xE74E;</system:String>
-    <system:String x:Key="iconHamburgerLoadSettings">&#xE896;</system:String>
-    <system:String x:Key="iconHamburgerLanguageSettings">&#xF2B7;</system:String>
-    <system:String x:Key="iconHamburgerOpenGithub">&#xE128;</system:String>
+    <Geometry x:Key="iconHamburgerApplySettings">M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z</Geometry>
+    <Geometry x:Key="iconHamburgerSaveSettings">M15,9H5V5H15M12,19A3,3 0 0,1 9,16A3,3 0 0,1 12,13A3,3 0 0,1 15,16A3,3 0 0,1 12,19M17,3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V7L17,3Z</Geometry>
+    <Geometry x:Key="iconHamburgerLoadSettings">M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z</Geometry>
+    <Geometry x:Key="iconHamburgerLanguageSettings">M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z</Geometry>
+    <Geometry x:Key="iconHamburgerOpenGithub">M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z</Geometry>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/W10SS_GUI_2/W10SS_GUI/Resource/tags.xaml b/W10SS_GUI_2/W10SS_GUI/Resource/tags.xaml
index fe4a1c8d..a4444591 100644
--- a/W10SS_GUI_2/W10SS_GUI/Resource/tags.xaml
+++ b/W10SS_GUI_2/W10SS_GUI/Resource/tags.xaml
@@ -9,7 +9,7 @@
     <system:String x:Key="tagCategorySystem">System</system:String>
     <system:String x:Key="tagCategoryStartMenu">Start Menu</system:String>
     <system:String x:Key="tagCategoryUwp">UWP Apps</system:String>
-    <system:String x:Key="tagCategoryWinGame">Windows Game Recording</system:String>
+    <system:String x:Key="tagCategoryWinGame">Game Mode</system:String>
     <system:String x:Key="tagCategoryTaskScheduler">Task Scheduler</system:String>
     <system:String x:Key="tagCategoryDefender">Microsoft Defender</system:String>
     <system:String x:Key="tagCategoryContextMenu">Context Menu</system:String>
diff --git a/W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj b/W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj
index 9b4385ef..40a55417 100644
--- a/W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj
+++ b/W10SS_GUI_2/W10SS_GUI/W10SS_GUI.csproj
@@ -37,6 +37,10 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -71,10 +75,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\TogglesCategoryPanel.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Controls\ToggleSwitch.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -117,9 +117,6 @@
     <Compile Include="Controls\HamburgerCategoryFlashButton.xaml.cs">
       <DependentUpon>HamburgerCategoryFlashButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TogglesCategoryPanel.xaml.cs">
-      <DependentUpon>TogglesCategoryPanel.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Controls\ToggleSwitch.xaml.cs">
       <DependentUpon>ToggleSwitch.xaml</DependentUpon>
     </Compile>