4 files changed, 23 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
index 121f43595..b013096e4 100644
--- a/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
+++ b/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml
@@ -13,7 +13,6 @@
         <StackPanel Grid.Row="0"
                     Height="30"
                     Margin="0,0,0,10"
-                    Background="White"
                     Orientation="Horizontal">
             <Image Width="24"
                    Height="24"
diff --git a/win/CS/HandBrakeWPF/Views/Images/File32.png b/win/CS/HandBrakeWPF/Views/Images/File32.png
new file mode 100644
index 000000000..2b2ecba65
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/File32.png
diff --git a/win/CS/HandBrakeWPF/Views/Images/folder32.png b/win/CS/HandBrakeWPF/Views/Images/folder32.png
new file mode 100644
index 000000000..6a5b8e19f
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Views/Images/folder32.png
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index d1add8edf..46fc614f0 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -6,7 +6,6 @@
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
              xmlns:attachedProperties="clr-namespace:HandBrakeWPF.AttachedProperties"
-             xmlns:handBrakeWpf="clr-namespace:HandBrakeWPF"
              AllowDrop="True"
         FontSize="11"
         Micro:Message.Attach="[Event Loaded] = [Action Load]"
@@ -187,7 +186,23 @@
                      ToolBar.OverflowMode="Never"
                      ToolBarTray.IsLocked="True"
                      >
-                <Menu Background="Transparent">
+
+                <Button Name="SelectSource"
+                        Micro:Message.Attach="[Event Click] = [Action SelectSourceWindow]">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Width="32"
+                               Height="32"
+                               Source="Images/Movies.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Source"
+                               />
+                    </StackPanel>
+                </Button>
+                
+                
+                <Menu Background="Transparent" Visibility="Collapsed">
                     <MenuItem ItemsSource="{Binding SourceMenu}" attachedProperties:DriveMenu.ShowAvailableDrives="true">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
@@ -201,6 +216,7 @@
                                        />
                             </StackPanel>
                         </MenuItem.Header>
+                        
                         <MenuItem.Resources>
                             <Image x:Key="Movie" x:Shared="False" MaxWidth="16" SnapsToDevicePixels="True" Source="Images/file.png" />
                             <Image x:Key="Folder" x:Shared="False" MaxWidth="16" SnapsToDevicePixels="True" Source="Images/folder.png" />
@@ -667,7 +683,11 @@
                 </Grid>
             </GroupBox>
         </Grid>
-
+        
+        <!-- Source Selection-->       
+        <Controls:SourceSelection Grid.Row="1" Width="400" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"
+                                  Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}}"  />
+        
         <!--  StatusPanel  -->
         <Controls:StatusPanel x:Name="loadingPanel"
                               Grid.Row="1"