--- a/src/iconolab/apps.py	Thu Aug 02 09:09:39 2018 +0200
+++ b/src/iconolab/apps.py	Thu Aug 02 10:51:00 2018 +0200
@@ -7,7 +7,8 @@
     def ready(self):
         import iconolab.signals.handlers
         import iconolab.templatetags.iconolab_tags
-        from iconolab.conf import settings
+        from iconolab.conf import settings as iconolab_settings
+        from django.conf import settings
         from PIL import Image
         if settings.ICONOLAB_MAX_IMAGE_PIXELS and settings.ICONOLAB_MAX_IMAGE_PIXELS > 0:
             Image.MAX_IMAGE_PIXELS = settings.ICONOLAB_MAX_IMAGE_PIXELS