diff --git a/assets/Cog.png b/assets/Cog.png
new file mode 100755
index 0000000..d0b1e8a
Binary files /dev/null and b/assets/Cog.png differ
diff --git a/assets/Next.png b/assets/Next.png
new file mode 100755
index 0000000..e9199d3
Binary files /dev/null and b/assets/Next.png differ
diff --git a/assets/Pause.png b/assets/Pause.png
new file mode 100755
index 0000000..df09a10
Binary files /dev/null and b/assets/Pause.png differ
diff --git a/assets/Play.png b/assets/Play.png
new file mode 100755
index 0000000..12e4a2b
Binary files /dev/null and b/assets/Play.png differ
diff --git a/src/main.rs b/src/main.rs
index 2fe81b3..64876a8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -85,7 +85,8 @@ impl eframe::App for JpmmvApp
                         egui::FontId::new(24.0, eframe::epaint::FontFamily::Proportional),
                     );
 
-                    if ui.button("Skip").clicked() 
+                    // if ui.button("Skip").clicked() 
+                    if ui.add(egui::Button::image_and_text(egui::include_image!("../assets/Next.png"), "")).clicked()
                     {
                         player_interface::next_track();
                         self.force_query = true
diff --git a/src/player_interface.rs b/src/player_interface.rs
index 18bf477..fbcec81 100644
--- a/src/player_interface.rs
+++ b/src/player_interface.rs
@@ -36,6 +36,11 @@ pub fn get_song_metadata() -> SongMetadata
 
     let split: Vec<&str> = result.split(',').collect();
 
+    if split.len() < 4
+    {
+        return sm;
+    }
+
     sm.name = split[0].to_string();
     sm.artist = split[1].to_string();
     sm.album = split[2].to_string();