diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 8aba00f66..65ee578e1 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -912,6 +912,7 @@
     <None Include="Modules\Games\EurotruckSimulator2\Resources\Win32\ets2-telemetry-server.dll" />
     <None Include="Modules\Games\EurotruckSimulator2\Resources\Win64\ets2-telemetry-server.dll" />
     <None Include="Resources\audio.png" />
+    <None Include="Resources\ambilight.png" />
     <Content Include="Resources\CounterStrike\csgoGamestateConfiguration.txt" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Artemis/Artemis/Profiles/Layers/Types/AmbientLight/AmbientLightType.cs b/Artemis/Artemis/Profiles/Layers/Types/AmbientLight/AmbientLightType.cs
index 67c53fae2..9cdfdc856 100644
--- a/Artemis/Artemis/Profiles/Layers/Types/AmbientLight/AmbientLightType.cs
+++ b/Artemis/Artemis/Profiles/Layers/Types/AmbientLight/AmbientLightType.cs
@@ -11,6 +11,8 @@ using Artemis.Profiles.Layers.Types.AmbientLight.AmbienceCreator;
 using Artemis.Profiles.Layers.Types.AmbientLight.Model;
 using Artemis.Profiles.Layers.Types.AmbientLight.Model.Extensions;
 using Artemis.Profiles.Layers.Types.AmbientLight.ScreenCapturing;
+using Artemis.Properties;
+using Artemis.Utilities;
 using Artemis.ViewModels.Profiles;
 using Newtonsoft.Json;
 
@@ -81,11 +83,10 @@ namespace Artemis.Profiles.Layers.Types.AmbientLight
 
         public ImageSource DrawThumbnail(LayerModel layer)
         {
-            //TODO DarthAffe 30.10.2016: Add a real thumbnail
             Rect thumbnailRect = new Rect(0, 0, 18, 18);
             DrawingVisual visual = new DrawingVisual();
             using (DrawingContext c = visual.RenderOpen())
-                c.DrawRectangle(new SolidColorBrush(Colors.Magenta), new Pen(new SolidColorBrush(Colors.DarkMagenta), 2), thumbnailRect);
+                c.DrawImage(ImageUtilities.BitmapToBitmapImage(Resources.ambilight), thumbnailRect);
 
             return new DrawingImage(visual.Drawing);
         }
diff --git a/Artemis/Artemis/Properties/Resources.Designer.cs b/Artemis/Artemis/Properties/Resources.Designer.cs
index f9f421337..207ddd094 100644
--- a/Artemis/Artemis/Properties/Resources.Designer.cs
+++ b/Artemis/Artemis/Properties/Resources.Designer.cs
@@ -60,6 +60,16 @@ namespace Artemis.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ambilight {
+            get {
+                object obj = ResourceManager.GetObject("ambilight", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/Artemis/Artemis/Properties/Resources.resx b/Artemis/Artemis/Properties/Resources.resx
index 537017134..44eae2ca5 100644
--- a/Artemis/Artemis/Properties/Resources.resx
+++ b/Artemis/Artemis/Properties/Resources.resx
@@ -211,4 +211,7 @@
   <data name="lua_placeholder" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lua-placeholder.lua;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="ambilight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ambilight.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/Artemis/Artemis/Resources/ambilight.png b/Artemis/Artemis/Resources/ambilight.png
new file mode 100644
index 000000000..7525f6acd
Binary files /dev/null and b/Artemis/Artemis/Resources/ambilight.png differ