diff --git a/Filtration.ObjectModel/ThemeEditor/Theme.cs b/Filtration.ObjectModel/ThemeEditor/Theme.cs
index 954a2c8..91f2722 100644
--- a/Filtration.ObjectModel/ThemeEditor/Theme.cs
+++ b/Filtration.ObjectModel/ThemeEditor/Theme.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
+using System.Xml.Serialization;
 using Filtration.ObjectModel.Enums;
 
 namespace Filtration.ObjectModel.ThemeEditor
@@ -17,6 +18,8 @@ namespace Filtration.ObjectModel.ThemeEditor
         }
 
         public string Name { get; set; }
+
+        [XmlIgnore]
         public string FilePath { get; set; }
 
         public ThemeComponentCollection Components
diff --git a/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs b/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs
index 27ab695..dcfbe11 100644
--- a/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs
+++ b/Filtration.ObjectModel/ThemeEditor/ThemeComponent.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows.Media;
+using System.Xml.Serialization;
 using Filtration.ObjectModel.Annotations;
 using Filtration.ObjectModel.Enums;
 
@@ -13,7 +14,12 @@ namespace Filtration.ObjectModel.ThemeEditor
         private Color _color;
         private EventHandler _themeComponentUpdatedEventHandler;
         private readonly object _eventLock = new object();
-        
+
+        public ThemeComponent()
+        {
+            
+        }
+
         public ThemeComponent(ThemeComponentType componentType, string componentName, Color componentColor)
         {
             if (componentName == null || componentColor == null)
@@ -51,7 +57,7 @@ namespace Filtration.ObjectModel.ThemeEditor
         public event EventHandler ThemeComponentDeleted;
 
         public string ComponentName { get; set; }
-        public ThemeComponentType ComponentType{ get; private set; }
+        public ThemeComponentType ComponentType{ get; set; }
 
         public Color Color
         {
diff --git a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
index 2c986b0..aab12ce 100644
--- a/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
+++ b/Filtration.ThemeEditor/ViewModels/ThemeEditorViewModel.cs
@@ -169,6 +169,7 @@ namespace Filtration.ThemeEditor.ViewModels
                 FilePath = saveDialog.FileName;
                 _themeProvider.SaveTheme(this, FilePath);
                 _filenameIsFake = false;
+                Title = Filename;
                 //RemoveDirtyFlag();
             }
             catch (Exception e)
diff --git a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
index 76a7a5c..e4c5853 100644
--- a/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
+++ b/Filtration.ThemeEditor/Views/ThemeComponentControl.xaml
@@ -19,10 +19,6 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="25" />
         </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
         <Grid.Resources>
             <DataTemplate x:Key="EditableComponentNameTemplate">
                 <TextBox Text="{Binding ComponentName}" />
@@ -31,23 +27,25 @@
                 <TextBlock Text="{Binding ComponentName}" ToolTip="{Binding ComponentName}" />
             </DataTemplate>
         </Grid.Resources>
-        <TextBlock Grid.Row="0"
-                   Grid.Column="1"
-                   Text="{Binding UsageCount, StringFormat='Usages: {0}'}"
-                   FontSize="10"
-                   Visibility="{Binding Path=DataContext.EditEnabled, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}, Converter={StaticResource BooleanVisibilityConverter}}">
-            <TextBlock.Style>
-                <Style TargetType="TextBlock">
-                    <Style.Triggers>
-                        <DataTrigger Binding="{Binding UsageCount}" Value="0">
-                            <Setter Property="Foreground" Value="Red" />
-                        </DataTrigger>
-                    </Style.Triggers>
-                    <Setter Property="Foreground" Value="SteelBlue"></Setter>
-                </Style>
-            </TextBlock.Style>
-        </TextBlock>
-        <ContentControl Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Content="{Binding}">
+        <DockPanel LastChildFill="True">
+            <TextBlock DockPanel.Dock="Left"
+                       Text="{Binding UsageCount, StringFormat='Usages: {0}'}"
+                       FontSize="10"
+                       HorizontalAlignment="Right"
+                       Visibility="{Binding Path=DataContext.EditEnabled, RelativeSource={RelativeSource AncestorType={x:Type views:ThemeEditorView}}, Converter={StaticResource BooleanVisibilityConverter}}">
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding UsageCount}" Value="0">
+                                <Setter Property="Foreground" Value="Red" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                        <Setter Property="Foreground" Value="SteelBlue" />
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+        </DockPanel>
+        <ContentControl Grid.Row="1" Content="{Binding}">
             <ContentControl.Style>
                 <Style TargetType="ContentControl">
                     <Style.Triggers>
@@ -62,6 +60,6 @@
             </ContentControl.Style>
         </ContentControl>
 
-        <xctk:ColorPicker Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"  SelectedColor="{Binding Color}" />
+        <xctk:ColorPicker Grid.Row="2" SelectedColor="{Binding Color}" />
     </Grid>
 </UserControl>
diff --git a/Filtration.ThemeEditor/Views/ThemeEditorView.xaml b/Filtration.ThemeEditor/Views/ThemeEditorView.xaml
index 911a1e0..dc218a4 100644
--- a/Filtration.ThemeEditor/Views/ThemeEditorView.xaml
+++ b/Filtration.ThemeEditor/Views/ThemeEditorView.xaml
@@ -40,7 +40,7 @@
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="ListViewItem">
-                                    <Border Name="Border" Padding="2" SnapsToDevicePixels="true">
+                                    <Border Name="Border" BorderBrush="Black" Background="White"  BorderThickness="1" CornerRadius="3" Margin="2" SnapsToDevicePixels="true">
                                         <ContentPresenter />
                                     </Border>
                                     <ControlTemplate.Triggers>
@@ -62,7 +62,7 @@
                     <GroupStyle>
                         <GroupStyle.HeaderTemplate>
                             <DataTemplate>
-                                <TextBlock FontWeight="Bold" FontSize="15" Text="{Binding Path=Name, Converter={StaticResource ThemeComponentTypeToStringConverter}}"/>
+                                <TextBlock Margin="7,5,0,0" FontWeight="Bold" FontSize="15" Text="{Binding Path=Name, Converter={StaticResource ThemeComponentTypeToStringConverter}}"/>
                             </DataTemplate>
                         </GroupStyle.HeaderTemplate>
                     </GroupStyle>
diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index d7eadc4..8d1aff4 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -427,6 +427,8 @@
     <Resource Include="Resources\Icons\ReplaceColors.ico" />
     <Resource Include="Resources\Icons\Theme.ico" />
     <Resource Include="Resources\Icons\filtration_icon.png" />
+    <Resource Include="Resources\Icons\Add.ico" />
+    <Resource Include="Resources\Icons\ThemeComponentDelete.ico" />
     <Content Include="Resources\ItemBaseTypes.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/Filtration/Resources/Icons/Add.ico b/Filtration/Resources/Icons/Add.ico
new file mode 100644
index 0000000..f81e2cd
Binary files /dev/null and b/Filtration/Resources/Icons/Add.ico differ
diff --git a/Filtration/Resources/Icons/ThemeComponentDelete.ico b/Filtration/Resources/Icons/ThemeComponentDelete.ico
new file mode 100644
index 0000000..24a4b48
Binary files /dev/null and b/Filtration/Resources/Icons/ThemeComponentDelete.ico differ
diff --git a/Filtration/Views/IconsDictionary.xaml b/Filtration/Views/IconsDictionary.xaml
index 4b4c6b6..f4fea97 100644
--- a/Filtration/Views/IconsDictionary.xaml
+++ b/Filtration/Views/IconsDictionary.xaml
@@ -29,4 +29,6 @@
     <Image Source="/Filtration;component/Resources/Icons/Paste.ico" x:Key="PasteIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/PasteStyle.ico" x:Key="PasteStyleIcon" x:Shared="False" />
     <Image Source="/Filtration;component/Resources/Icons/filtration_icon.png" x:Key="FiltrationIcon" x:Shared="False" />
+    <Image Source="/Filtration;component/Resources/Icons/Add.ico" x:Key="AddIcon" x:Shared="False" />
+    <Image Source="/Filtration;component/Resources/Icons/ThemeComponentDelete.ico" x:Key="ThemeComponentDeleteIcon" x:Shared="False" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Filtration/Views/MainWindow.xaml b/Filtration/Views/MainWindow.xaml
index e0e3f27..a6975ca 100644
--- a/Filtration/Views/MainWindow.xaml
+++ b/Filtration/Views/MainWindow.xaml
@@ -10,7 +10,7 @@
         xmlns:views="clr-namespace:Filtration.Views"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=viewModels:MainWindowViewModel}"
-        Title="{Binding WindowTitle}" Height="768" Width="1100" BorderThickness="1" BorderBrush="Black" IsIconVisible="True" >
+        Title="{Binding WindowTitle}" Height="762" Width="1126" IsIconVisible="True" >
     <fluent:RibbonWindow.InputBindings>
         <KeyBinding Command="{Binding SaveCommand}" Modifiers="Control" Key="S" />
         <KeyBinding Command="{Binding OpenScriptCommand}" Modifiers="Control" Key="O" />
@@ -64,9 +64,9 @@
             </fluent:Ribbon.ContextualGroups>
             <fluent:RibbonTabItem Header="View">
                 <fluent:RibbonGroupBox Header="Tools">
-                    <fluent:ToggleButton Header="Section Browser" Width="150" SizeDefinition="Middle" Icon="{StaticResource AddSectionIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.SectionBrowserViewModel.IsVisible}" />
-                    <fluent:ToggleButton Header="Block Group Browser" Width="150" SizeDefinition="Middle" Icon="{StaticResource BlockGroupBrowserIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.BlockGroupBrowserViewModel.IsVisible}" />
-                    <fluent:ToggleButton Header="Block Output Preview" Width="150" SizeDefinition="Middle" Icon="{StaticResource BlockOutputPreviewIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.BlockOutputPreviewViewModel.IsVisible}" />
+                    <fluent:ToggleButton Header="Section Browser" Width="150" Size="Middle" Icon="{StaticResource AddSectionIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.SectionBrowserViewModel.IsVisible}"/>
+                    <fluent:ToggleButton Header="Block Group Browser" SizeDefinition="Middle" Icon="{StaticResource BlockGroupBrowserIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.BlockGroupBrowserViewModel.IsVisible}" />
+                    <fluent:ToggleButton Header="Block Output Preview" SizeDefinition="Middle" Icon="{StaticResource BlockOutputPreviewIcon}" IsChecked="{Binding AvalonDockWorkspaceViewModel.BlockOutputPreviewViewModel.IsVisible}" />
                 </fluent:RibbonGroupBox>
             </fluent:RibbonTabItem>
             <fluent:RibbonTabItem x:Name="ScriptToolsTabItem" Header="Script Tools" Group="{Binding ElementName=ScriptToolsGroup}" Visibility="{Binding ActiveDocumentIsScript, Converter={StaticResource BooleanVisibilityConverter}, Mode=OneWay}" >
@@ -103,12 +103,12 @@
             </fluent:RibbonTabItem>
             <fluent:RibbonTabItem x:Name="ThemeToolsTabItem" Header="Theme Tools" Group="{Binding ElementName=ThemeToolsGroup}" Visibility="{Binding ActiveDocumentIsTheme, Converter={StaticResource BooleanVisibilityConverter}, Mode=OneWay}">
                 <fluent:RibbonGroupBox Header="Add Components">
-                    <fluent:Button SizeDefinition="Middle" Header="Add Text Color" Command="{Binding AddTextColorThemeComponentCommand}" />
-                    <fluent:Button SizeDefinition="Middle" Header="Add Background Color" Command="{Binding AddBackgroundColorThemeComponentCommand}" />
-                    <fluent:Button SizeDefinition="Middle" Header="Add Border Color" Command="{Binding AddBorderColorThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Text Color" Icon="{StaticResource AddIcon}" Command="{Binding AddTextColorThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Background Color" Icon="{StaticResource AddIcon}" Command="{Binding AddBackgroundColorThemeComponentCommand}" />
+                    <fluent:Button SizeDefinition="Middle" Header="Add Border Color" Icon="{StaticResource AddIcon}" Command="{Binding AddBorderColorThemeComponentCommand}" />
                 </fluent:RibbonGroupBox>
                 <fluent:RibbonGroupBox Header="Delete">
-                    <fluent:Button Header="Delete Theme Component" Command="{Binding DeleteThemeComponentCommand}" />
+                    <fluent:Button Header="Delete Theme Component" Icon="{StaticResource ThemeComponentDeleteIcon}" LargeIcon="{StaticResource ThemeComponentDeleteIcon}" Command="{Binding DeleteThemeComponentCommand}" />
                 </fluent:RibbonGroupBox>
             </fluent:RibbonTabItem>
         </fluent:Ribbon>