WinGui: Further work on the new Dark Theme. Mostly around icons.

52 files changed, 37 insertions, 47 deletions

diff --git a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png b/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png
deleted file mode 100644
index 8c9f5631a..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png b/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png
deleted file mode 100644
index 833dd0407..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/AddToQueue.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/Close.png b/win/CS/HandBrakeWPF/Views/Images/Close.png
deleted file mode 100644
index 4953577a0..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Close.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Activity.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Activity.png
new file mode 100644
index 000000000..fc3424945
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Activity.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Activity2.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Activity2.png
new file mode 100644
index 000000000..506db8690
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Activity2.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Add.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Add.png
new file mode 100644
index 000000000..224f7fd3f
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Add.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/AddToQueue.png b/win/CS/HandBrakeWPF/Views/Images/Dark/AddToQueue.png
new file mode 100644
index 000000000..7f233e85a
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/AddToQueue.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Advanced.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Advanced.png
new file mode 100644
index 000000000..72ab6f0b4
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Advanced.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Copy.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Copy.png
new file mode 100644
index 000000000..f3d805511
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Copy.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Disc.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Disc.png
new file mode 100644
index 000000000..d90cf0c0f
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Disc.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/File.png b/win/CS/HandBrakeWPF/Views/Images/Dark/File.png
new file mode 100644
index 000000000..43270580f
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/File.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Folder.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Folder.png
new file mode 100644
index 000000000..6ff3f43c7
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Folder.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/New.png b/win/CS/HandBrakeWPF/Views/Images/Dark/New.png
new file mode 100644
index 000000000..d3caab5c5
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/New.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Presets2.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Presets2.png
new file mode 100644
index 000000000..2466c3b28
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Presets2.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Preview.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Preview.png
new file mode 100644
index 000000000..5bd6797b1
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Preview.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Queue.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Queue.png
new file mode 100644
index 000000000..fa6303c2b
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Queue.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Refresh.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Refresh.png
new file mode 100644
index 000000000..9a149ec92
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Refresh.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Remove.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Remove.png
new file mode 100644
index 000000000..ad3b255fe
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Remove.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Settings.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Settings.png
new file mode 100644
index 000000000..e31e6ed16
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Settings.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Dark/Source.png b/win/CS/HandBrakeWPF/Views/Images/Dark/Source.png
new file mode 100644
index 000000000..891c70339
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Dark/Source.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Light/Activity.png b/win/CS/HandBrakeWPF/Views/Images/Light/Activity.png
new file mode 100644
index 000000000..a2de1eead
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Activity.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png b/win/CS/HandBrakeWPF/Views/Images/Light/Activity2.png
index 2589bc085..2589bc085 100644
--- a/win/CS/HandBrakeWPF/Views/Images/ActivityWindow_small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Activity2.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/add.png b/win/CS/HandBrakeWPF/Views/Images/Light/Add.png
index 742b5d871..742b5d871 100644
--- a/win/CS/HandBrakeWPF/Views/Images/add.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Add.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/AddToQueue_small.png b/win/CS/HandBrakeWPF/Views/Images/Light/AddToQueue.png
index 4ac073682..4ac073682 100644
--- a/win/CS/HandBrakeWPF/Views/Images/AddToQueue_small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/AddToQueue.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Advanced.png b/win/CS/HandBrakeWPF/Views/Images/Light/Advanced.png
index 23eab12dc..23eab12dc 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Advanced.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Advanced.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Light/Copy.png b/win/CS/HandBrakeWPF/Views/Images/Light/Copy.png
new file mode 100644
index 000000000..1c8794e14
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Copy.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Light/Disc.png b/win/CS/HandBrakeWPF/Views/Images/Light/Disc.png
new file mode 100644
index 000000000..c69081b1e
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Disc.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/File32.png b/win/CS/HandBrakeWPF/Views/Images/Light/File.png
index b97c6bafd..b97c6bafd 100644
--- a/win/CS/HandBrakeWPF/Views/Images/File32.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/File.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/folder32.png b/win/CS/HandBrakeWPF/Views/Images/Light/Folder.png
index 79ceadfe1..79ceadfe1 100644
--- a/win/CS/HandBrakeWPF/Views/Images/folder32.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Folder.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Options24.png b/win/CS/HandBrakeWPF/Views/Images/Light/New.png
index 17bd284c8..17bd284c8 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Options24.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/New.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Presets2.png b/win/CS/HandBrakeWPF/Views/Images/Light/Presets2.png
index f4205306e..f4205306e 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Presets2.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Presets2.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/picture_small.png b/win/CS/HandBrakeWPF/Views/Images/Light/Preview.png
index bb57b35b4..bb57b35b4 100644
--- a/win/CS/HandBrakeWPF/Views/Images/picture_small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Preview.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Queue_Small.png b/win/CS/HandBrakeWPF/Views/Images/Light/Queue.png
index cf586b0f9..cf586b0f9 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Queue_Small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Queue.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Light/Refresh.png b/win/CS/HandBrakeWPF/Views/Images/Light/Refresh.png
new file mode 100644
index 000000000..c2939aa54
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Refresh.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/remove.png b/win/CS/HandBrakeWPF/Views/Images/Light/Remove.png
index dd6459f2a..dd6459f2a 100644
--- a/win/CS/HandBrakeWPF/Views/Images/remove.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Remove.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Light/Settings.png b/win/CS/HandBrakeWPF/Views/Images/Light/Settings.png
new file mode 100644
index 000000000..d1e9757e7
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Settings.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Movies_small.png b/win/CS/HandBrakeWPF/Views/Images/Light/Source.png
index 128edda8c..128edda8c 100644
--- a/win/CS/HandBrakeWPF/Views/Images/Movies_small.png
+++ b/win/CS/HandBrakeWPF/Views/Images/Light/Source.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/Movies.png b/win/CS/HandBrakeWPF/Views/Images/Movies.png
deleted file mode 100644
index 9afc3cf67..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Movies.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/Output_Small.png b/win/CS/HandBrakeWPF/Views/Images/Output_Small.png
deleted file mode 100644
index 91f43b411..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Output_Small.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png b/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png
deleted file mode 100644
index c7b9a84d7..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Pref_Small.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/Preferences.png b/win/CS/HandBrakeWPF/Views/Images/Preferences.png
deleted file mode 100644
index 118b2b5e5..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Preferences.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/Queue.png b/win/CS/HandBrakeWPF/Views/Images/Queue.png
deleted file mode 100644
index f682dc0e3..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Queue.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/Refresh.ico b/win/CS/HandBrakeWPF/Views/Images/Refresh.ico
deleted file mode 100644
index 3267a092a..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/Refresh.ico
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/add40.png b/win/CS/HandBrakeWPF/Views/Images/add40.png
deleted file mode 100644
index 45174b420..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/add40.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/copy.png b/win/CS/HandBrakeWPF/Views/Images/copy.png
deleted file mode 100644
index cdaca677a..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/copy.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/file.png b/win/CS/HandBrakeWPF/Views/Images/file.png
deleted file mode 100644
index 208778c57..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/file.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/folder.png b/win/CS/HandBrakeWPF/Views/Images/folder.png
deleted file mode 100644
index fe35b6e82..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/folder.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/Images/picture.png b/win/CS/HandBrakeWPF/Views/Images/picture.png
deleted file mode 100644
index afb153b09..000000000
--- a/win/CS/HandBrakeWPF/Views/Images/picture.png
+++ /dev/null
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index f8f185644..eaa65f3e5 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -3,6 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

         xmlns:cal="http://www.caliburnproject.org"

         xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

+        xmlns:converters="clr-namespace:HandBrakeWPF.Converters"

         Title="{Binding Title}"

         Width="525"

         Height="600"

@@ -10,6 +11,11 @@
         MinHeight="600"

         WindowStartupLocation="CenterScreen"

         TextOptions.TextFormattingMode="Display">

+

+    <Window.Resources>

+        <converters:ThemeImageConverter x:Key="themeConverter" />

+    </Window.Resources>

+

     <Grid>

         <Grid>

             <Grid.RowDefinitions>

@@ -27,14 +33,14 @@
                 <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0" 

                         AutomationProperties.Name="{x:Static Properties:Resources.LogView_CopyClipboard}" >

                     <StackPanel Orientation="Horizontal">

-                        <Image Width="16" Source="Images/copy.png" />

+                        <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='../Views/Images/Copy.png'}" />

                         <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:Resources.LogView_CopyClipboard}" />

                     </StackPanel>

                 </Button>

                 <Button Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action OpenLogDirectory]"

                         AutomationProperties.Name="{x:Static Properties:Resources.LogView_OpenLogDir}" >

                     <StackPanel Orientation="Horizontal">

-                        <Image Width="16" Source="Images/folder.png" />

+                        <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Folder.png'}" />

                         <TextBlock Margin="2,0,0,0" Text="{x:Static Properties:Resources.LogView_OpenLogDir}" />

                     </StackPanel>

                 </Button>

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 524cc150e..fecc7ffcf 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -23,6 +23,7 @@
         <Converters:LongToIntConverter x:Key="longToIntConverter" />

         <queue:InlineQueueConverter x:Key="InlineQueueConverter" />

         <Converters:BooleanConverter x:Key="NotBooleanConverter" />

+        <Converters:ThemeImageConverter x:Key="themeConverter" />

 

         <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">

             <Setter Property="Padding" Value="8,2" />

@@ -87,18 +88,18 @@
                 <MenuItem Header="{x:Static Properties:Resources.MainView_ToolsMenu}">

                     <MenuItem Header="{x:Static Properties:Resources.MainView_ShowQueueMenu}" cal:Message.Attach="[Event Click] = [Action OpenQueueWindow]" InputGestureText="Ctrl + Q">

                         <MenuItem.Icon>

-                            <Image Width="16" Source="Images/Queue_Small.png" />

+                            <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Queue.png'}" />

                         </MenuItem.Icon>

                     </MenuItem>

                     <MenuItem Header="{x:Static Properties:Resources.MainView_ActivityLogMenu}" cal:Message.Attach="[Event Click] = [Action OpenLogWindow]"  InputGestureText="Ctrl + L">

                         <MenuItem.Icon>

-                            <Image Width="16" Source="Images/Output_Small.png" />

+                            <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Activity.png'}" />

                         </MenuItem.Icon>

                     </MenuItem>

                     <Separator />

                     <MenuItem Header="{x:Static Properties:Resources.MainView_PreferencesMenu}" cal:Message.Attach="[Event Click] = [Action OpenOptionsWindow]">

                         <MenuItem.Icon>

-                            <Image Width="16" Source="Images/Pref_Small.png" />

+                            <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Settings.png'}" />

                         </MenuItem.Icon>

                     </MenuItem>

                 </MenuItem>

@@ -170,7 +171,7 @@
                     <StackPanel Orientation="Horizontal">

                         <Image Width="32"

                                Height="32"

-                               Source="Images/Movies_small.png"/>

+                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Source.png'}"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

                                Content="{x:Static Properties:Resources.MainView_SourceOpen}"/>

@@ -182,7 +183,7 @@
                 <Button PreviewMouseLeftButtonDown="AddToQueue_PreviewMouseDown" ContextMenuService.IsEnabled="False" AutomationProperties.Name="{x:Static Properties:Resources.MainView_AddToQueue}">

                     <StackPanel Orientation="Horizontal">

                         <StackPanel Orientation="Horizontal">

-                            <Image Width="32" Height="32" SnapsToDevicePixels="True" Source="Images/AddToQueue_small.png" />

+                            <Image Width="32" Height="32" SnapsToDevicePixels="True" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='AddToQueue.png'}" />

                             <Label Margin="8,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:Resources.MainView_AddToQueue}" />

                         </StackPanel>

 

@@ -209,7 +210,7 @@
                     <StackPanel Orientation="Horizontal">

                         <Image Width="32"

                                Height="32"

-                               Source="Images/AddToQueue_small.png"/>

+                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='AddToQueue.png'}"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

                                Content="{x:Static Properties:Resources.MainView_AddSelection}"/>

@@ -223,7 +224,7 @@
                     <StackPanel Orientation="Horizontal">

                         <Image Width="32"

                                Height="32"

-                               Source="Images/AddToQueue_small.png"/>

+                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='AddToQueue.png'}"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

                                Content="{x:Static Properties:Resources.MainView_AddAll}"/>

@@ -284,7 +285,7 @@
                         <Image Width="32"

                                Height="32"

                                SnapsToDevicePixels="True"

-                               Source="Images/Queue_small.png"/>

+                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Queue.png'}"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

                                Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:Resources.MainView_ShowQueue}'}"/>

@@ -296,7 +297,7 @@
                         <Image Width="32"

                                Height="32"

                                SnapsToDevicePixels="True"

-                               Source="Images/picture_small.png"/>

+                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Queue.png'}"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

                                Content="{x:Static Properties:Resources.MainView_ShowPreview}"/>

@@ -307,7 +308,7 @@
                     <StackPanel Orientation="Horizontal">

                         <Image Width="32"

                                Height="32"

-                               Source="Images/ActivityWindow_small.png"/>

+                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Activity2.png'}"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

                                Content="Activity Log"/>

@@ -319,7 +320,7 @@
                     <StackPanel Orientation="Horizontal">

                         <Image Width="32"

                                Height="32"

-                               Source="Images/Presets2.png"/>

+                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Presets2.png'}"/>

                         <Label Margin="8,0,0,0"

                                VerticalAlignment="Center"

                                Content="Presets"/>

@@ -721,7 +722,7 @@
                                     <StackPanel Orientation="Horizontal">

                                         <Image Width="20"

                                                Height="20"

-                                               Source="Images/add.png"

+                                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Add.png'}"

                                         />

                                         <TextBlock Margin="2,0,0,0"

                                                    VerticalAlignment="Center"

@@ -737,7 +738,7 @@
                                     <StackPanel Orientation="Horizontal">

                                         <Image Width="20"

                                                Height="20"

-                                               Source="Images/remove.png"

+                                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Remove.png'}"

                                                SnapsToDevicePixels="True"

                                         />

                                         <TextBlock Margin="2,0,0,0"

@@ -755,7 +756,7 @@
                                         <StackPanel Orientation="Horizontal">

                                             <Image Width="20"

                                                    Height="20"

-                                                   Source="Images/Advanced.png"

+                                                   Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}"

                                                    RenderOptions.BitmapScalingMode="HighQuality"

                                             />

                                             <TextBlock Margin="2,0,0,0"

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 8ad81537e..bc4f0e447 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -34,6 +34,7 @@
         <video:EncoderOptionsTooltipConverter x:Key="encoderOptionsTooltipConverter" />

         <video:VideoOptionsTooltipConverter x:Key="videoOptionsTooltipConverter" />

         <queue:PictureSettingsDescConveter x:Key="pictureSettingsDescConverter" />

+        <Converters:ThemeImageConverter x:Key="themeConverter" />

 

         <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">

             <Setter Property="ToolTipService.ShowDuration" Value="10000" />

@@ -64,7 +65,7 @@
                 <MenuItem>

                     <MenuItem.Header>

                         <StackPanel Height="32" Orientation="Horizontal">

-                            <Image Source="Images/Advanced.png" Width="20" Height="20" VerticalAlignment="Center" />

+                            <Image Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}" Width="20" Height="20" VerticalAlignment="Center" />

                             <TextBlock VerticalAlignment="Center"

                                        Text="{x:Static Properties:Resources.QueueView_Options}" Margin="5,0,0,0" />

                             <Path Height="5"

@@ -163,7 +164,7 @@
                         <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}" Opened="ContextMenu_OnOpened">

                             <MenuItem Header="{x:Static Properties:Resources.QueueView_PlayMediaFile}" cal:Message.Attach="[Event Click] = [Action PlayFile]" />

                             <Separator />

-                            <MenuItem x:Name="RetryMenuItem" Header="{x:Static Properties:Resources.QueueView_Retry}" Click="QueueItem_Retry" />

+                            <MenuItem x:Name="ResetMenuItem" Header="{x:Static Properties:Resources.QueueView_Reset}" Click="QueueItem_Retry" />

                             <MenuItem x:Name="DeleteMenuItem" Header="{x:Static Properties:Resources.QueueView_Delete}" Click="QueueItem_Delete" />

                             <Separator />

                             <MenuItem x:Name="EditMenuItem" Header="{x:Static Properties:Resources.QueueView_Edit}" Click="QueueItem_Edit" />

@@ -202,7 +203,7 @@
                                         <Style TargetType="{x:Type Image}">

                                             <Style.Triggers>

                                                 <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">

-                                                    <Setter Property="Source" Value="Images/Movies.png" />

+                                                    <Setter Property="Source" Value="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Source.png'}" />

                                                 </DataTrigger>

                                                 <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="In Progress">

                                                     <Setter Property="Source" Value="Images/Working0.png" />

@@ -340,13 +341,13 @@
                                     </Style>

                                 </StackPanel.Resources>

 

-                                <Button AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Retry}"  ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">

+                                <Button AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Reset}"  ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">

                                     <Button.Content>

                                         <StackPanel Orientation="Horizontal">

                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0"

-                                               Source="Images/Refresh.ico">

+                                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Refresh.png'}">

                                             </Image>

-                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Retry}" />

+                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Reset}" />

                                         </StackPanel>

 

                                     </Button.Content>

@@ -363,7 +364,7 @@
                                     <Button.Content>

                                         <StackPanel Orientation="Horizontal">

                                             <Image Width="20" Margin="0,0,5,0" Height="20" VerticalAlignment="Center"

-                                               Source="Images/options24.png">

+                                               Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='New.png'}">

                                             </Image>

                                             <TextBlock Text="{x:Static Properties:Resources.QueueView_Edit}" />

                                         </StackPanel>

@@ -377,30 +378,12 @@
                                     </i:Interaction.Triggers>

                                 </Button>

 

-                                <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Delete}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}">

-                                    <Button.Content>

-                                        <StackPanel Orientation="Horizontal">

-                                            <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" 

-                                               Source="Images/close64_dark.png">

-                                            </Image>

-                                            <TextBlock Text="{x:Static Properties:Resources.QueueView_Delete}" />

-                                        </StackPanel>

-                                    </Button.Content>

-                                    <i:Interaction.Triggers>

-                                        <i:EventTrigger EventName="Click">

-                                            <cal:ActionMessage MethodName="RemoveJob">

-                                                <cal:Parameter Value="{Binding SelectedTask}" />

-                                            </cal:ActionMessage>

-                                        </i:EventTrigger>

-                                    </i:Interaction.Triggers>

-                                </Button>

-

                                 <Button x:Name="queueOptionsDropButton" Margin="10,0,0,0" Click="QueueOptionsDropButton_OnClick"

                                         AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Actions}" IsEnabled="{Binding CanPerformActionOnSource}">

                                     <Button.Content>

                                         <StackPanel Orientation="Horizontal">

                                             <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" 

-                                                   Source="Images/Advanced.png">

+                                                   Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}">

                                             </Image>

 

                                             <TextBlock Margin="0,0,5,0" Padding="0"

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs b/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
index aed7faf36..6ee87bed2 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs
@@ -67,16 +67,16 @@ namespace HandBrakeWPF.Views
             }

 

             // Handle menu state

-            this.RetryMenuItem.Header = this.queueJobs.SelectedItems.Count > 1 ? Properties.Resources.QueueView_ResetSelectedJobs : Properties.Resources.QueueView_Retry;

+            this.ResetMenuItem.Header = this.queueJobs.SelectedItems.Count > 1 ? Properties.Resources.QueueView_ResetSelectedJobs : Properties.Resources.QueueView_Reset;

             if (this.queueJobs.SelectedItems.Count > 1)

             {

-                this.RetryMenuItem.IsEnabled = false;

+                this.ResetMenuItem.IsEnabled = false;

 

                 foreach (QueueTask task in this.queueJobs.SelectedItems)

                 {

                     if (task.Status == QueueItemStatus.Error || task.Status == QueueItemStatus.Completed)

                     {

-                        this.RetryMenuItem.IsEnabled = true;

+                        this.ResetMenuItem.IsEnabled = true;

                         break;

                     }

                 }

@@ -86,11 +86,11 @@ namespace HandBrakeWPF.Views
                 var activeQueueTask = this.mouseActiveQueueTask;

                 if (activeQueueTask != null && (activeQueueTask.Status == QueueItemStatus.Error || activeQueueTask.Status == QueueItemStatus.Completed))

                 {

-                    this.RetryMenuItem.IsEnabled = true;

+                    this.ResetMenuItem.IsEnabled = true;

                 }

                 else

                 {

-                    this.RetryMenuItem.IsEnabled = false;

+                    this.ResetMenuItem.IsEnabled = false;

                 }

             }