diff --git a/Source/Examples/Properties/Resources.Designer.cs b/Source/Examples/Properties/Resources.Designer.cs
index 38530858..6b6e7a23 100644
--- a/Source/Examples/Properties/Resources.Designer.cs
+++ b/Source/Examples/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4918
+//     Runtime Version:2.0.50727.4200
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -60,6 +60,13 @@ namespace OpenTK.Examples.Properties {
             }
         }
         
+        internal static System.Drawing.Icon App {
+            get {
+                object obj = ResourceManager.GetObject("App", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to #region License
         /////
@@ -403,7 +410,7 @@ namespace OpenTK.Examples.Properties {
         ///using OpenTK;
         ///using OpenTK.Graphics;
         ///using OpenTK.Graphics.OpenGL;
-        ///        /// [rest of string was truncated]&quot;;.
+        ///u [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string JuliaSetFractal {
             get {
@@ -448,6 +455,7 @@ namespace OpenTK.Examples.Properties {
         ///#endregion
         ///
         ///using System;
+        ///using System.Diagnostics;
         ///using System.Threading;
         ///using System.IO;
         ///
@@ -458,8 +466,7 @@ namespace OpenTK.Examples.Properties {
         ///{
         ///    [Example(&quot;Playback&quot;, ExampleCategory.OpenAL, &quot;1.1&quot;, Documentation=&quot;Playback&quot;)]
         ///    public class Playback
-        ///    {
-        ///        static readonly [rest of string was truncated]&quot;;.
+        ///    [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Playback {
             get {
@@ -585,6 +592,7 @@ namespace OpenTK.Examples.Properties {
         ///#endregion
         ///
         ///using System;
+        ///using System.Diagnostics;
         ///using System.Collections.Generic;
         ///using System.Text;
         ///using System.Threading;
@@ -595,9 +603,7 @@ namespace OpenTK.Examples.Properties {
         ///
         ///namespace Examples.OpenAL
         ///{
-        ///    // Not working correctly (sound pops).
-        ///
-        ///    //[Example(&quot;Strea [rest of string was truncated]&quot;;.
+        ///    // Not working correctly (sound pops [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string StreamingPlayback {
             get {
@@ -749,7 +755,7 @@ namespace OpenTK.Examples.Properties {
         ///
         ///namespace Examples.Tutorial
         ///{
-        ///    [Example(&quot;Vertex Buffer Objects&quot;, ExampleCategory.OpenGL, &quot;1 [rest of string was truncated]&quot;;.
+        ///    [Example(&quot;Static Vertex Buffer Objects&quot;, ExampleCategory.Ope [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string VertexBufferObject {
             get {
diff --git a/Source/Examples/Properties/Resources.resx b/Source/Examples/Properties/Resources.resx
index 4eb44aaf..9d09d3b8 100644
--- a/Source/Examples/Properties/Resources.resx
+++ b/Source/Examples/Properties/Resources.resx
@@ -38,7 +38,7 @@
     
     The mimetype is used for serialized objects, and tells the 
     ResXResourceReader how to depersist the object. This is currently not 
-    EXTensible. For a given mimetype the value must be set accordingly:
+    extensible. For a given mimetype the value must be set accordingly:
     
     Note - application/x-microsoft.net.object.binary.base64 is the format 
     that the ResXResourceWriter will generate, however the reader can 
@@ -199,4 +199,7 @@
   <data name="SimpleGLSL" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\OpenGL\GLSL\SimpleGLSL.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="App" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\App.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Source/Examples/Resources/App.ico b/Source/Examples/Resources/App.ico
new file mode 100644
index 00000000..e6ade5b1
Binary files /dev/null and b/Source/Examples/Resources/App.ico differ
diff --git a/Source/Examples/Utilities.cs b/Source/Examples/Utilities.cs
index ce2d1690..6e50fdcf 100644
--- a/Source/Examples/Utilities.cs
+++ b/Source/Examples/Utilities.cs
@@ -33,12 +33,14 @@ namespace Examples
         {
             ExampleAttribute info = GetExampleAttribute(window.GetType());
             window.Title = String.Format("OpenTK | {0} {1}: {2}", info.Category, info.Difficulty, info.Title);
+            window.Icon = OpenTK.Examples.Properties.Resources.App;
         }
 
         public static void SetWindowTitle(System.Windows.Forms.Form window)
         {
             ExampleAttribute info = GetExampleAttribute(window.GetType());
             window.Text = String.Format("OpenTK | {0} {1}: {2}", info.Category, info.Difficulty, info.Title);
+            window.Icon = OpenTK.Examples.Properties.Resources.App;
         }
 
         static ExampleAttribute GetExampleAttribute(Type type)