diff --git a/Espera/Espera.View/Espera.View.csproj b/Espera/Espera.View/Espera.View.csproj
index f53a4523..bcd6ef7b 100644
--- a/Espera/Espera.View/Espera.View.csproj
+++ b/Espera/Espera.View/Espera.View.csproj
@@ -347,6 +347,14 @@
       <Name>Espera.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Next.png" />
+    <Resource Include="Images\Play.png" />
+    <Resource Include="Images\Previous.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Pause.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/Espera/Espera.View/Images/Next.png b/Espera/Espera.View/Images/Next.png
new file mode 100644
index 00000000..8b7d9c8f
Binary files /dev/null and b/Espera/Espera.View/Images/Next.png differ
diff --git a/Espera/Espera.View/Images/Pause.png b/Espera/Espera.View/Images/Pause.png
new file mode 100644
index 00000000..abe898ae
Binary files /dev/null and b/Espera/Espera.View/Images/Pause.png differ
diff --git a/Espera/Espera.View/Images/Play.png b/Espera/Espera.View/Images/Play.png
new file mode 100644
index 00000000..c33963af
Binary files /dev/null and b/Espera/Espera.View/Images/Play.png differ
diff --git a/Espera/Espera.View/Images/Previous.png b/Espera/Espera.View/Images/Previous.png
new file mode 100644
index 00000000..3071d779
Binary files /dev/null and b/Espera/Espera.View/Images/Previous.png differ
diff --git a/Espera/Espera.View/Views/ShellView.xaml b/Espera/Espera.View/Views/ShellView.xaml
index 7d777751..d773f422 100644
--- a/Espera/Espera.View/Views/ShellView.xaml
+++ b/Espera/Espera.View/Views/ShellView.xaml
@@ -138,6 +138,26 @@
             </dialogs:SimpleDialog>
         </ResourceDictionary>
     </Window.Resources>
+    <Window.TaskbarItemInfo>
+        <TaskbarItemInfo>
+            <TaskbarItemInfo.ThumbButtonInfos>
+                <ThumbButtonInfoCollection>
+                    <ThumbButtonInfo x:Name="PauseContinueTaskbarButton"
+                                     Command="{Binding PauseContinueCommand}"
+                                     DismissWhenClicked="False">
+                    </ThumbButtonInfo>
+                    <ThumbButtonInfo Command="{Binding PreviousSongCommand}"
+                                     DismissWhenClicked="False"
+                                     Description="Previous Song"
+                                     ImageSource="../Images/Previous.png" />
+                    <ThumbButtonInfo Command="{Binding NextSongCommand}"
+                                     DismissWhenClicked="False"
+                                     Description="Next Song"
+                                     ImageSource="../Images/Next.png" />
+                </ThumbButtonInfoCollection>
+            </TaskbarItemInfo.ThumbButtonInfos>
+        </TaskbarItemInfo>
+    </Window.TaskbarItemInfo>
     <Controls:MetroWindow.RightWindowCommands>
         <Controls:WindowCommands>
             <Button Command="{Binding Path=ShowSettingsCommand}" Content="settings" />
diff --git a/Espera/Espera.View/Views/ShellView.xaml.cs b/Espera/Espera.View/Views/ShellView.xaml.cs
index d7085320..7068b15c 100644
--- a/Espera/Espera.View/Views/ShellView.xaml.cs
+++ b/Espera/Espera.View/Views/ShellView.xaml.cs
@@ -16,6 +16,7 @@
 using MahApps.Metro;
 using MahApps.Metro.Controls.Dialogs;
 using ReactiveUI;
+using Splat;
 using YoutubeExtractor;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using ListView = System.Windows.Controls.ListView;
@@ -42,6 +43,7 @@ public ShellView()
                 this.WirePlayer();
                 this.WireScreenStateUpdater();
                 this.WireDragAndDrop();
+                this.WireTaskbarButtons();
 
                 try
                 {
@@ -407,5 +409,18 @@ private void WireScreenStateUpdater()
                 source.AddHook(HandleWindowMove);
             });
         }
+
+        private void WireTaskbarButtons()
+        {
+            this.shellViewModel.WhenAnyValue(x => x.IsPlaying, x => x ? "Pause" : "Play")
+                .BindTo(this.PauseContinueTaskbarButton, x => x.Description);
+            this.shellViewModel.WhenAnyValue(x => x.IsPlaying, x => x ? "Pause" : "Play")
+                .Select(x => string.Format("pack://application:,,,/Espera;component/Images/{0}.png", x))
+                .Select(x => BitmapLoader.Current.LoadFromResource(x, null, null).ToObservable())
+                .Switch()
+                .Select(x => x.ToNative())
+                .ObserveOn(RxApp.MainThreadScheduler)
+                .BindTo(this.PauseContinueTaskbarButton, x => x.ImageSource);
+        }
     }
 }
\ No newline at end of file