diff --git a/Aurora.gtk/Aurora.gtk.csproj b/Aurora.gtk/Aurora.gtk.csproj
index 08f7eb5..bd0e220 100644
--- a/Aurora.gtk/Aurora.gtk.csproj
+++ b/Aurora.gtk/Aurora.gtk.csproj
@@ -155,6 +155,9 @@
     <Reference Include="System.Linq.Async">
       <HintPath>..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll</HintPath>
     </Reference>
+    <Reference Include="OpenTK.GLControl">
+      <HintPath>..\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -166,6 +169,10 @@
     <EmbeddedResource Include="LibVLCSharp.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\backward.png" />
+    <EmbeddedResource Include="Resources\forwards.png" />
+    <EmbeddedResource Include="Resources\like.png" />
+    <EmbeddedResource Include="Resources\play.png" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="gtk-gui\generated.cs" />
diff --git a/Aurora.gtk/Program.cs b/Aurora.gtk/Program.cs
index 7dd898c..a3e02b1 100644
--- a/Aurora.gtk/Program.cs
+++ b/Aurora.gtk/Program.cs
@@ -12,14 +12,12 @@ namespace Aurora.gtk
         {
             Gtk.Application.Init();
             LibVLCSharpFormsRenderer.Init();
-
             // For some reason, Xamarin does not pick the LibVLCSharp.Form.Platforms.Gtk assembly as a renderer assembly. 
             // Add it manually.
 
             //Also css doesn't work without adding the Xaml assembly
             global::Xamarin.Forms.Forms.Init(new[] { typeof(LibVLCSharp.Forms.Platforms.GTK.VideoViewRenderer).Assembly, typeof(Xamarin.Forms.Xaml.ArrayExtension).Assembly });
 
-
             if (PlatformHelper.GetGTKPlatform() == GTKPlatform.Windows)
             {
                 GtkThemes.LoadCustomTheme("Themes/gtkrc-dark");
diff --git a/Aurora.gtk/Resources/backward.png b/Aurora.gtk/Resources/backward.png
new file mode 100644
index 0000000..047aeb8
Binary files /dev/null and b/Aurora.gtk/Resources/backward.png differ
diff --git a/Aurora.gtk/Resources/forwards.png b/Aurora.gtk/Resources/forwards.png
new file mode 100644
index 0000000..29b4b3f
Binary files /dev/null and b/Aurora.gtk/Resources/forwards.png differ
diff --git a/Aurora.gtk/Resources/like.png b/Aurora.gtk/Resources/like.png
new file mode 100644
index 0000000..0ed3e1b
Binary files /dev/null and b/Aurora.gtk/Resources/like.png differ
diff --git a/Aurora.gtk/Resources/play.png b/Aurora.gtk/Resources/play.png
new file mode 100644
index 0000000..90264e6
Binary files /dev/null and b/Aurora.gtk/Resources/play.png differ
diff --git a/Aurora.gtk/gtk-gui/gui.stetic b/Aurora.gtk/gtk-gui/gui.stetic
index 7614896..0d4f676 100644
--- a/Aurora.gtk/gtk-gui/gui.stetic
+++ b/Aurora.gtk/gtk-gui/gui.stetic
@@ -5,8 +5,8 @@
   </configuration>
   <import>
     <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <widget-library name="../../packages/Xamarin.Forms.Platform.GTK.3.6.0.344457/lib/net45/webkit-sharp.dll" />
-    <widget-library name="../../packages/LibVLCSharp.GTK.3.0.0/lib/net47/LibVLCSharp.GTK.dll" />
+    <widget-library name="../../packages/Xamarin.Forms.Platform.GTK.4.3.0.991211/lib/net45/webkit-sharp.dll" />
+    <widget-library name="../../packages/LibVLCSharp.GTK.3.3.1/lib/net47/LibVLCSharp.GTK.dll" />
     <widget-library name="../bin/Debug/Aurora.gtk.exe" internal="true" />
   </import>
   <widget class="Gtk.Window" id="MainWindow" design-size="400 300">
diff --git a/Aurora.gtk/packages.config b/Aurora.gtk/packages.config
index ec8433b..5a9a979 100644
--- a/Aurora.gtk/packages.config
+++ b/Aurora.gtk/packages.config
@@ -14,6 +14,7 @@
   <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net47" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net47" />
   <package id="OpenTK" version="3.1.0" targetFramework="net47" />
+  <package id="OpenTK.GLControl" version="3.0.1" targetFramework="net47" />
   <package id="Sharpnado.Forms.HorizontalListView" version="1.3.0" targetFramework="net47" />
   <package id="System.Buffers" version="4.4.0" targetFramework="net47" />
   <package id="System.Interactive.Async" version="4.0.0" targetFramework="net47" />
diff --git a/Aurora/Aurora.csproj b/Aurora/Aurora.csproj
index d12e469..e0a58ce 100644
--- a/Aurora/Aurora.csproj
+++ b/Aurora/Aurora.csproj
@@ -42,6 +42,8 @@
         <Folder Include="Design\Components\Library\" />
         <Folder Include="Design\Views\Profile\" />
         <Folder Include="Design\Components\DataGrid\" />
+        <Folder Include="Resources\" />
+        <Folder Include="Design\Extensions\" />
     </ItemGroup>
     <ItemGroup>
       <Compile Remove="Design\Behaviors\DeselectItemBehaviorBase.cs" />
@@ -59,7 +61,10 @@
         <Protobuf Include="Proto\sync.proto" />
     </ItemGroup>
     <ItemGroup>
-      <EmbeddedResource Include="Design\Resources\unselected.png" />
+      <EmbeddedResource Include="Resources\backward.png" />
+      <EmbeddedResource Include="Resources\forwards.png" />
+      <EmbeddedResource Include="Resources\like.png" />
+      <EmbeddedResource Include="Resources\play.png" />
     </ItemGroup>
     <ItemGroup>
         <EmbeddedResource Update="Design\Components\NavigationMenu\NavigationMenu.css">
@@ -68,5 +73,10 @@
     </ItemGroup>
     <ItemGroup>
       <None Remove="Design\Resources\unselected.png" />
+      <None Remove="Design\Components\MediaPlayer\play.png" />
+      <None Remove="Resources\backward.png" />
+      <None Remove="Resources\forwards.png" />
+      <None Remove="Resources\like.png" />
+      <None Remove="Resources\play.png" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Aurora/Design/Components/MediaPlayer/Player.xaml b/Aurora/Design/Components/MediaPlayer/Player.xaml
index 8618c09..7d15ab6 100644
--- a/Aurora/Design/Components/MediaPlayer/Player.xaml
+++ b/Aurora/Design/Components/MediaPlayer/Player.xaml
@@ -2,6 +2,7 @@
 <ContentView
      xmlns="http://xamarin.com/schemas/2014/forms"
      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+     xmlns:local="clr-namespace:Aurora.Design.Extensions"
      x:Class="Aurora.Design.Components.MediaPlayer.Player">
     <ContentView.Resources>
         <StyleSheet
@@ -33,19 +34,20 @@
                  Grid.Column="1"
                  HorizontalOptions="Center"
                  Orientation="Horizontal">
-                <Button
-                     Text="Previous"
+                <Image Source="{local:ImageResource Aurora.gtk.Resources.forward.png}" />
+                <ImageButton
                      x:Name="PreviousButton"
+                     Source="{local:ImageResource Aurora.gtk.Resources.backward.png}"
                      WidthRequest="100"
-                     HeightRequest="50"/>
-                <Button
+                     HeightRequest="50"></ImageButton>
+                <ImageButton
                      x:Name="PlayButton"
-                     Text="Play/Pause"
+                     Source="{local:ImageResource Aurora.gtk.Resources.play.png}"
                      WidthRequest="100"
                      HeightRequest="50"/>
-                <Button
-                     Text="Next"
+                <ImageButton
                      x:Name="NextButton"
+                     Source="{local:ImageResource Aurora.gtk.Resources.forward.png}"
                      WidthRequest="100"
                      HeightRequest="50"/>
             </StackLayout>
diff --git a/Aurora/Design/Extensions/ImageResourceExtension.cs b/Aurora/Design/Extensions/ImageResourceExtension.cs
new file mode 100644
index 0000000..312dc4f
--- /dev/null
+++ b/Aurora/Design/Extensions/ImageResourceExtension.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Aurora.Design.Extensions
+{
+    [ContentProperty(nameof(Source))]
+    public class ImageResourceExtension : IMarkupExtension
+    {
+        public string Source { get; set; }
+
+        public object ProvideValue(IServiceProvider serviceProvider)
+        {
+            if (Source == null)
+            {
+                return null;
+            }
+            Assembly[] referencedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            var gtkAsm = referencedAssemblies.FirstOrDefault((e) =>
+            {
+                return e.FullName.Contains("Aurora.gtk");
+            });
+
+            foreach (var res in gtkAsm.GetManifestResourceNames())
+            {
+                System.Diagnostics.Debug.WriteLine("found resource: " + res);
+            }
+
+            if (gtkAsm == null && gtkAsm is Assembly)
+            {
+                return null;
+            }
+
+            // Do your translation lookup here, using whatever method you require
+            var imageSource = ImageSource.FromResource(Source, gtkAsm);
+
+            return imageSource;
+        }
+    }
+}
diff --git a/Aurora/Design/Resources/unselected.png b/Aurora/Design/Resources/unselected.png
deleted file mode 100644
index f4c4d9f..0000000
Binary files a/Aurora/Design/Resources/unselected.png and /dev/null differ
diff --git a/Aurora/Resources/backward.png b/Aurora/Resources/backward.png
new file mode 100644
index 0000000..047aeb8
Binary files /dev/null and b/Aurora/Resources/backward.png differ
diff --git a/Aurora/Resources/forwards.png b/Aurora/Resources/forwards.png
new file mode 100644
index 0000000..29b4b3f
Binary files /dev/null and b/Aurora/Resources/forwards.png differ
diff --git a/Aurora/Resources/like.png b/Aurora/Resources/like.png
new file mode 100644
index 0000000..0ed3e1b
Binary files /dev/null and b/Aurora/Resources/like.png differ
diff --git a/Aurora/Resources/play.png b/Aurora/Resources/play.png
new file mode 100644
index 0000000..90264e6
Binary files /dev/null and b/Aurora/Resources/play.png differ