diff --git a/include/modules/hyprland/workspaces.hpp b/include/modules/hyprland/workspaces.hpp
index 9a44e594..9cc81ec9 100644
--- a/include/modules/hyprland/workspaces.hpp
+++ b/include/modules/hyprland/workspaces.hpp
@@ -39,6 +39,7 @@ class Workspaces : public AModule, public EventHandler {
   auto specialVisibleOnly() const -> bool { return m_specialVisibleOnly; }
   auto persistentOnly() const -> bool { return m_persistentOnly; }
   auto moveToMonitor() const -> bool { return m_moveToMonitor; }
+  auto uniqueIcons() const -> bool { return m_uniqueIcons; }
 
   auto getBarOutput() const -> std::string { return m_bar.output->name; }
 
@@ -126,6 +127,7 @@ class Workspaces : public AModule, public EventHandler {
   bool m_specialVisibleOnly = false;
   bool m_persistentOnly = false;
   bool m_moveToMonitor = false;
+  bool m_uniqueIcons = false;
   Json::Value m_persistentWorkspaceConfig;
 
   // Map for windows stored in workspaces not present in the current bar.
diff --git a/src/modules/hyprland/workspace.cpp b/src/modules/hyprland/workspace.cpp
index b58c1719..01678a54 100644
--- a/src/modules/hyprland/workspace.cpp
+++ b/src/modules/hyprland/workspace.cpp
@@ -1,6 +1,7 @@
 #include <json/value.h>
 #include <spdlog/spdlog.h>
 
+#include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ -95,7 +96,10 @@ void Workspace::insertWindow(WindowCreationPayload create_window_payload) {
   if (!create_window_payload.isEmpty(m_workspaceManager)) {
     auto repr = create_window_payload.repr(m_workspaceManager);
 
-    if (!repr.empty()) {
+    if (!repr.empty() && (!m_workspaceManager.uniqueIcons() ||
+                          std::ranges::find_if(m_windowMap, [&repr](const auto &x) {
+                            return x.second == repr;
+                          }) == m_windowMap.end())) {
       m_windowMap[create_window_payload.getAddress()] = repr;
     }
   }
diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index cfc62025..1c5d6e38 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -609,6 +609,7 @@ auto Workspaces::parseConfig(const Json::Value &config) -> void {
   populateBoolConfig(config, "persistent-only", m_persistentOnly);
   populateBoolConfig(config, "active-only", m_activeOnly);
   populateBoolConfig(config, "move-to-monitor", m_moveToMonitor);
+  populateBoolConfig(config, "unique-icons", m_uniqueIcons);
 
   m_persistentWorkspaceConfig = config.get("persistent-workspaces", Json::Value());
   populateSortByConfig(config);
@@ -1038,4 +1039,4 @@ std::optional<int> Workspaces::parseWorkspaceId(std::string const &workspaceIdSt
   }
 }
 
-}  // namespace waybar::modules::hyprland
\ No newline at end of file
+}  // namespace waybar::modules::hyprland
diff --git a/test/config.cpp b/test/config.cpp
index c60519ce..22d0b07e 100644
--- a/test/config.cpp
+++ b/test/config.cpp
@@ -139,6 +139,7 @@ TEST_CASE("Load Hyprland Workspaces bar config", "[config]") {
   REQUIRE(hyprland["active-only"].asBool() == true);
   REQUIRE(hyprland["all-outputs"].asBool() == false);
   REQUIRE(hyprland["move-to-monitor"].asBool() == true);
+  REQUIRE(hyprland["unique-icons"].asBool() == true);
   REQUIRE(hyprland["format"].asString() == "{icon} {windows}");
   REQUIRE(hyprland["format-window-separator"].asString() == " ");
   REQUIRE(hyprland["on-scroll-down"].asString() == "hyprctl dispatch workspace e-1");
diff --git a/test/config/hyprland-workspaces.json b/test/config/hyprland-workspaces.json
index dd733897..903e94f9 100644
--- a/test/config/hyprland-workspaces.json
+++ b/test/config/hyprland-workspaces.json
@@ -29,6 +29,7 @@
       "window-rewrite": {
         "title<Steam>": ""
       },
+      "unique-icons": true,
       "window-rewrite-default": "",
       "window-rewrite-separator": " ",
       "sort-by": "number"