diff --git a/MainWindow.xaml b/MainWindow.xaml
index d7a2ff4..74fa1bb 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -3,6 +3,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="d3gamepad" Height="720" Width="1280" Topmost="True" AllowsTransparency="True" WindowStyle="None" Background="{x:Null}" Left="0" Top="0">
     <Canvas x:Name="Canvas1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-        <Image x:Name="GamepadIco" Height="50" Width="50" Source="Ressources/XBOne_Gamepad.png" Canvas.Top="-50" Opacity="0.75" Canvas.Left="0"/>
+        <Image x:Name="GamepadIco" Height="50" Width="50" Source="img/XBOne_Gamepad.png" Canvas.Top="-50" Opacity="0.75" Canvas.Left="0"/>
     </Canvas>
 </Window>
\ No newline at end of file
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 788508e..4c5ba98 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -18,6 +18,8 @@
 using System.Text;
 using System.Windows.Input;
 using System.Drawing;
+using System.Windows.Media.Imaging;
+using System.Windows.Interop;
 
 namespace d3gamepad
 {
@@ -36,6 +38,10 @@ public partial class MainWindow : Window
         [DllImport("user32.dll")]
         static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
 
+        [DllImport("gdi32.dll", EntryPoint = "DeleteObject")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool DeleteObject([In] IntPtr hObject);
+
         public static Bitmap CaptureFromScreen(System.Drawing.Point location, int width, int height)
         {
             Bitmap bmpScreenCapture = new Bitmap(width, height);
@@ -293,6 +299,24 @@ public static void ThreadUI()
             }
         }
 
+        public static Bitmap GetImageByName(string imageName)
+        {
+            System.Reflection.Assembly asm = System.Reflection.Assembly.GetExecutingAssembly();
+            string resourceName = asm.GetName().Name + ".Properties.Resources";
+            var rm = new System.Resources.ResourceManager(resourceName, asm);
+            return (Bitmap)rm.GetObject(imageName);
+        }
+
+        public ImageSource ImageSourceFromBitmap(Bitmap bmp)
+        {
+            var handle = bmp.GetHbitmap();
+            try
+            {
+                return Imaging.CreateBitmapSourceFromHBitmap(handle, IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
+            }
+            finally { DeleteObject(handle); }
+        }
+
         static d3gamepad.MainWindow myForm;
         static Canvas myCanvas;
         static System.Windows.Controls.Image myGamepad;
@@ -331,7 +355,7 @@ public MainWindow()
                 {
                     Fill = new ImageBrush
                     {
-                        ImageSource = new System.Windows.Media.Imaging.BitmapImage(new Uri(".\\Ressources\\XBOne_" + ico + ".png", UriKind.Relative))
+                        ImageSource = ImageSourceFromBitmap(GetImageByName("XBOne_" + ico))
                     },
                     Stretch = Stretch.Uniform,
                 };
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 13d3c20..530f090 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -1,71 +1,253 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Ce code a été généré par un outil.
-//     Version du runtime :4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
-//     le code est régénéré.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace d3gamepad.Properties
-{
-
-
+namespace d3gamepad.Properties {
+    using System;
+    
+    
     /// <summary>
-    ///   Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder
-    // à l'aide d'un outil, tel que ResGen ou Visual Studio.
-    // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
-    // avec l'option /str ou régénérez votre projet VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
-        ///   Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
+        ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("d3gamepad.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
-        ///   Remplace la propriété CurrentUICulture du thread actuel pour toutes
-        ///   les recherches de ressources à l'aide de cette classe de ressource fortement typée.
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_A {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_A", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_B {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_B", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_DPad {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_DPad", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_DPad_All {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_DPad_All", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_DPad_Down {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_DPad_Down", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_DPad_Left {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_DPad_Left", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_DPad_Right {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_DPad_Right", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_DPad_Up {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_DPad_Up", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_DPad_XAxis {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_DPad_XAxis", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_DPad_YAxis {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_DPad_YAxis", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_Gamepad {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_Gamepad", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_LB {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_LB", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_LT {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_LT", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_Menu {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_Menu", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_RB {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_RB", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_RT {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_RT", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_View {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_View", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_X {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_X", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap XBOne_Y {
+            get {
+                object obj = ResourceManager.GetObject("XBOne_Y", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index ffecec8..23fc1ff 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,67 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="XBOne_A" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_A.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_B" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_B.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_DPad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_DPad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_DPad_All" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_DPad_All.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_DPad_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_DPad_Down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_DPad_Left" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_DPad_Left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_DPad_Right" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_DPad_Right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_DPad_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_DPad_Up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_DPad_XAxis" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_DPad_XAxis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_DPad_YAxis" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_DPad_YAxis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_Gamepad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_Gamepad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_LB" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_LB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_LT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_LT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_Menu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_Menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_RB" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_RB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_RT" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_RT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_View" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_View.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_X" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_X.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="XBOne_Y" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\img\XBOne_Y.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Ressources/ImageSearchDLL.dll b/Ressources/ImageSearchDLL.dll
deleted file mode 100644
index 8f6f27e..0000000
Binary files a/Ressources/ImageSearchDLL.dll and /dev/null differ
diff --git a/Ressources/XBOne_A.png b/Ressources/XBOne_A.png
deleted file mode 100644
index 6d9ff3c..0000000
Binary files a/Ressources/XBOne_A.png and /dev/null differ
diff --git a/Ressources/XBOne_B.png b/Ressources/XBOne_B.png
deleted file mode 100644
index 622cd59..0000000
Binary files a/Ressources/XBOne_B.png and /dev/null differ
diff --git a/Ressources/XBOne_DPad.png b/Ressources/XBOne_DPad.png
deleted file mode 100644
index 97a3310..0000000
Binary files a/Ressources/XBOne_DPad.png and /dev/null differ
diff --git a/Ressources/XBOne_DPad_All.png b/Ressources/XBOne_DPad_All.png
deleted file mode 100644
index 885cd8f..0000000
Binary files a/Ressources/XBOne_DPad_All.png and /dev/null differ
diff --git a/Ressources/XBOne_DPad_Down.png b/Ressources/XBOne_DPad_Down.png
deleted file mode 100644
index d504160..0000000
Binary files a/Ressources/XBOne_DPad_Down.png and /dev/null differ
diff --git a/Ressources/XBOne_DPad_Left.png b/Ressources/XBOne_DPad_Left.png
deleted file mode 100644
index 93df4c4..0000000
Binary files a/Ressources/XBOne_DPad_Left.png and /dev/null differ
diff --git a/Ressources/XBOne_DPad_Right.png b/Ressources/XBOne_DPad_Right.png
deleted file mode 100644
index 80b213f..0000000
Binary files a/Ressources/XBOne_DPad_Right.png and /dev/null differ
diff --git a/Ressources/XBOne_DPad_Up.png b/Ressources/XBOne_DPad_Up.png
deleted file mode 100644
index 42b288a..0000000
Binary files a/Ressources/XBOne_DPad_Up.png and /dev/null differ
diff --git a/Ressources/XBOne_DPad_XAxis.png b/Ressources/XBOne_DPad_XAxis.png
deleted file mode 100644
index 497ab78..0000000
Binary files a/Ressources/XBOne_DPad_XAxis.png and /dev/null differ
diff --git a/Ressources/XBOne_DPad_YAxis.png b/Ressources/XBOne_DPad_YAxis.png
deleted file mode 100644
index bd1d746..0000000
Binary files a/Ressources/XBOne_DPad_YAxis.png and /dev/null differ
diff --git a/Ressources/XBOne_LB.png b/Ressources/XBOne_LB.png
deleted file mode 100644
index d7ac370..0000000
Binary files a/Ressources/XBOne_LB.png and /dev/null differ
diff --git a/Ressources/XBOne_LT.png b/Ressources/XBOne_LT.png
deleted file mode 100644
index c4efce9..0000000
Binary files a/Ressources/XBOne_LT.png and /dev/null differ
diff --git a/Ressources/XBOne_Menu.png b/Ressources/XBOne_Menu.png
deleted file mode 100644
index 152bdfe..0000000
Binary files a/Ressources/XBOne_Menu.png and /dev/null differ
diff --git a/Ressources/XBOne_RB.png b/Ressources/XBOne_RB.png
deleted file mode 100644
index a6edf0a..0000000
Binary files a/Ressources/XBOne_RB.png and /dev/null differ
diff --git a/Ressources/XBOne_RT.png b/Ressources/XBOne_RT.png
deleted file mode 100644
index ed253fe..0000000
Binary files a/Ressources/XBOne_RT.png and /dev/null differ
diff --git a/Ressources/XBOne_View.png b/Ressources/XBOne_View.png
deleted file mode 100644
index ad9b661..0000000
Binary files a/Ressources/XBOne_View.png and /dev/null differ
diff --git a/Ressources/XBOne_X.png b/Ressources/XBOne_X.png
deleted file mode 100644
index 6e9a061..0000000
Binary files a/Ressources/XBOne_X.png and /dev/null differ
diff --git a/Ressources/XBOne_Y.png b/Ressources/XBOne_Y.png
deleted file mode 100644
index fc8f1fc..0000000
Binary files a/Ressources/XBOne_Y.png and /dev/null differ
diff --git a/d3gamepad.csproj b/d3gamepad.csproj
index f671e86..0f5a7e8 100644
--- a/d3gamepad.csproj
+++ b/d3gamepad.csproj
@@ -167,70 +167,6 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Ressources\XBOne_A.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_B.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_DPad.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_DPad_All.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_DPad_Down.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_DPad_Left.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_DPad_Right.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_DPad_Up.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_DPad_XAxis.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_DPad_YAxis.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_LB.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_LT.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_Menu.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_RB.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_RT.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_View.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_X.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-    <Resource Include="Ressources\XBOne_Y.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Ressources\ImageSearchDLL.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Resource Include="Ressources\XBOne_Gamepad.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
       <Visible>False</Visible>
@@ -238,6 +174,63 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_A.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_B.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_DPad.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_DPad_All.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_DPad_Down.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_DPad_Left.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_DPad_Right.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_DPad_Up.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_DPad_XAxis.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_DPad_YAxis.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_LB.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_LT.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_Menu.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_RB.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_RT.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_View.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_X.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="img\XBOne_Y.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="img\XBOne_Gamepad.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Ressources/XBOne_Gamepad.png b/img/XBOne_Gamepad.png
similarity index 100%
rename from Ressources/XBOne_Gamepad.png
rename to img/XBOne_Gamepad.png