diff --git a/src/core/urlhandler.cpp b/src/core/urlhandler.cpp
index aaa2248ba..110fd674a 100644
--- a/src/core/urlhandler.cpp
+++ b/src/core/urlhandler.cpp
@@ -23,12 +23,10 @@
 #include <QtGlobal>
 #include <QObject>
 #include <QUrl>
-#include <QIcon>
 
+#include "song.h"
 #include "urlhandler.h"
 
 UrlHandler::LoadResult::LoadResult(const QUrl &original_url, Type type, const QUrl &media_url, const Song::FileType &filetype, qint64 length_nanosec) : original_url_(original_url), type_(type), media_url_(media_url), filetype_(filetype), length_nanosec_(length_nanosec) {}
 
 UrlHandler::UrlHandler(QObject *parent) : QObject(parent) {}
-
-QIcon UrlHandler::icon() const { return QIcon(); }
diff --git a/src/core/urlhandler.h b/src/core/urlhandler.h
index 205738c82..c5c245d0a 100644
--- a/src/core/urlhandler.h
+++ b/src/core/urlhandler.h
@@ -27,7 +27,6 @@
 #include <QObject>
 #include <QString>
 #include <QUrl>
-#include <QIcon>
 
 #include "song.h"
 
@@ -39,7 +38,6 @@ class UrlHandler : public QObject {
 
   // The URL scheme that this handler handles.
   virtual QString scheme() const = 0;
-  virtual QIcon icon() const;
 
   // Returned by StartLoading() and LoadNext(), indicates what the player should do when it wants to load a URL.
   struct LoadResult {
diff --git a/src/tidal/tidalurlhandler.cpp b/src/tidal/tidalurlhandler.cpp
index 864981045..d9c694e9b 100644
--- a/src/tidal/tidalurlhandler.cpp
+++ b/src/tidal/tidalurlhandler.cpp
@@ -17,16 +17,17 @@
  *
  */
 
-#include "tidalurlhandler.h"
+#include <QObject>
+#include <QString>
+#include <QUrl>
 
 #include "core/application.h"
 #include "core/taskmanager.h"
 #include "core/iconloader.h"
 #include "core/logging.h"
 #include "core/song.h"
-#include "playlistparsers/playlistparser.h"
 #include "tidal/tidalservice.h"
-#include "internet/internetmodel.h"
+#include "tidalurlhandler.h"
 
 TidalUrlHandler::TidalUrlHandler(
     Application *app, TidalService *service)
@@ -36,9 +37,6 @@ TidalUrlHandler::TidalUrlHandler(
 
 }
 
-QString TidalUrlHandler::scheme() const { return service_->url_scheme(); }
-QIcon TidalUrlHandler::icon() const { return IconLoader::Load("tidal"); }
-
 UrlHandler::LoadResult TidalUrlHandler::StartLoading(const QUrl &url) {
 
   LoadResult ret(url);
diff --git a/src/tidal/tidalurlhandler.h b/src/tidal/tidalurlhandler.h
index 6d6e7e902..811980442 100644
--- a/src/tidal/tidalurlhandler.h
+++ b/src/tidal/tidalurlhandler.h
@@ -20,8 +20,13 @@
 #ifndef TIDALURLHANDLER_H
 #define TIDALURLHANDLER_H
 
+#include <QObject>
+#include <QString>
+#include <QUrl>
+
 #include "core/urlhandler.h"
 #include "core/song.h"
+#include "tidal/tidalservice.h"
 
 class Application;
 class TidalService;
@@ -32,8 +37,7 @@ class TidalUrlHandler : public UrlHandler {
  public:
   TidalUrlHandler(Application *app, TidalService *service);
 
-  QString scheme() const;
-  QIcon icon() const;
+  QString scheme() const { return service_->url_scheme(); }
   LoadResult StartLoading(const QUrl &url);
 
   void CancelTask();