diff --git a/bumblebee_status/core/theme.py b/bumblebee_status/core/theme.py
index 82eded2..f02498b 100644
--- a/bumblebee_status/core/theme.py
+++ b/bumblebee_status/core/theme.py
@@ -52,10 +52,10 @@ class Theme(object):
         self.__keywords = {}
         self.__value_idx = {}
         self.__data = raw_data if raw_data else self.load(name)
-        for icons in self.__data.get("icons", []):
-            util.algorithm.merge(self.__data, self.load(icons, "icons"))
         if iconset != "auto":
             util.algorithm.merge(self.__data, self.load(iconset, "icons"))
+        for icons in self.__data.get("icons", []):
+            util.algorithm.merge(self.__data, self.load(icons, "icons"))
         for colors in self.__data.get("colors", []):
             util.algorithm.merge(self.__keywords, self.load_keywords(colors))