diff --git a/YACReaderLibrary/images_osx.qrc b/YACReaderLibrary/images_osx.qrc
index 14398e66..804d8810 100644
--- a/YACReaderLibrary/images_osx.qrc
+++ b/YACReaderLibrary/images_osx.qrc
@@ -71,5 +71,6 @@
         <file alias="images/sidebar/delete_sidebar@2x.png">../images/sidebar/delete_sidebar_osx@2x.png</file>
         <file alias="images/sidebar/addLabelIcon@2x.png">../images/sidebar/addLabelIcon_osx@2x.png</file>
         <file alias="images/sidebar/renameListIcon@2x.png">../images/sidebar/renameListIcon_osx@2x.png</file>
+        <file>YACReaderLibrary.icns</file>
     </qresource>
 </RCC>
diff --git a/YACReaderLibrary/images_win.qrc b/YACReaderLibrary/images_win.qrc
index fdb1ea0b..cb87e0cf 100644
--- a/YACReaderLibrary/images_win.qrc
+++ b/YACReaderLibrary/images_win.qrc
@@ -41,5 +41,6 @@
         <file>../images/lists/label_yellow.png</file>
         <file>../images/lists/list.png</file>
         <file>../images/empty_reading_list.png</file>
+        <file>icon.ico</file>
     </qresource>
 </RCC>
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 21c8610c..46cb5cd1 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -143,13 +143,20 @@ void LibraryWindow::setupUI()
     // If a window icon was set in main() we reuse it for the tray too.
     // This allows support for third party icon themes on Freedesktop(Linux/Unix)
     // systems.
-    // TODO: Luis, please tweak this to your liking and add OS macros if needed.
     if (!QApplication::windowIcon().isNull()) {
         trayIcon.setIcon(QApplication::windowIcon());
     } else {
-        // TODO: Luis: This is a placeholder. Add MacOS, Windows and maybe a fallback
-        // for other systems here.
+#ifdef Q_OS_WIN
+        trayIcon.setIcon(QIcon(":/icon.ico"));
+#else
+#ifdef Q_OS_MACOS
+        auto icon = QIcon(":/YACReaderLibrary.icns");
+        icon.setIsMask(true);
+        trayIcon.setIcon(icon);
+#else
         trayIcon.setIcon(QIcon(":/images/iconLibrary.png"));
+#endif
+#endif
     }
 
     connect(&trayIcon, &QSystemTrayIcon::activated,