diff --git a/apps/icons/api.py b/apps/icons/api.py
index f72dbaebe9..2ae275bd0c 100644
--- a/apps/icons/api.py
+++ b/apps/icons/api.py
@@ -1,7 +1,15 @@
+from __future__ import absolute_import
+
+from .conf import settings
 from .sets import THEME_ICONSETS, DEFAULT_THEME
+from .literals import ERROR
+
 
 def get_icon_name(icon):
-    return THEME_ICONSETS[DEFAULT_THEME]['icons'][icon]
+    try:
+        return THEME_ICONSETS[settings.ICON_SET][icon]
+    except KeyError:
+        return THEME_ICONSETS[settings.ICON_SET][ERROR]
 
 
 def get_sprite_name(icon):
diff --git a/apps/icons/literals.py b/apps/icons/literals.py
index aab8a85222..6bd5fa35c7 100644
--- a/apps/icons/literals.py
+++ b/apps/icons/literals.py
@@ -1,2 +1,10 @@
+#from icons.sets import fat_cow, famfamfam
+
+#DEFAULT_ICON_SET = fat_cow.ID
+DEFAULT_ICON_SET = 'fat_cow'
+
 APP = 'app'
 BACKUPS = 'backups'
+ERROR = 'error'
+ICONS = 'icons'
+
diff --git a/apps/icons/sets/__init__.py b/apps/icons/sets/__init__.py
index 98ae365303..5b1e567ce3 100644
--- a/apps/icons/sets/__init__.py
+++ b/apps/icons/sets/__init__.py
@@ -4,6 +4,19 @@ from django.utils.translation import ugettext_lazy as _
 
 from icons.sets import fat_cow, famfamfam
 
+
+SET_CHOICES = (
+    (fat_cow.ID, fat_cow.LABEL),
+    (famfamfam.ID, famfamfam.LABEL),
+)
+
+ICON_THEMES: {
+    fat_cow.ID: fat_cow.DICTIONARY,
+    famfamfam.ID: famfamfam.DICTIONARY
+}
+
+
+"""
 THEME_DEFAULT = 'default'
 
 SET_CHOICES = (
@@ -23,3 +36,4 @@ THEMES_CHOICES = {
 }
 
 DEFAULT_THEME = THEME_DEFAULT
+"""
diff --git a/apps/icons/sets/fat_cow.py b/apps/icons/sets/fat_cow.py
index 31427f8edc..280f9195a6 100644
--- a/apps/icons/sets/fat_cow.py
+++ b/apps/icons/sets/fat_cow.py
@@ -1,11 +1,16 @@
+import os
+
 from django.utils.translation import ugettext_lazy as _
 
 from icons.literals import *
 
+PATH = os.path.join('Fat Cow', '32x32')
 ID = 'fat_cow'
 LABEL = _(u'Fat cow')
 
 DICTIONARY = {
     APP: 'plugin.png',
     BACKUPS: 'cd_burn.png',
+    ERROR: 'error.png',
+    ICONS: 'application_view_icons.png',
 }
diff --git a/settings.py b/settings.py
index f34dce1e11..11f809aec7 100644
--- a/settings.py
+++ b/settings.py
@@ -147,6 +147,7 @@ INSTALLED_APPS = (
     'compressor',
     'djangorestframework',
     # Base generic
+    'app_registry',
     'permissions',
     'project_setup',
     'project_tools',
@@ -166,7 +167,6 @@ INSTALLED_APPS = (
     'clustering',
     'scheduler',
     'job_processor',
-    'app_registry',
     'icons',
     # Mayan EDMS
     'diagnostics',