diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 588d9034db..52befc8211 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -124,6 +124,8 @@ SERVER_EMAIL = ENV_TOKENS.get('SERVER_EMAIL', SERVER_EMAIL)
 THEME_NAME = ENV_TOKENS.get('THEME_NAME', None)
 if not THEME_NAME is None:
     enable_theme(THEME_NAME)
+    FAVICON_PATH = 'themes/%s/images/favicon.ico' % THEME_NAME
+
 
 #Timezone overrides
 TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 4102879723..be869628cf 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -330,6 +330,8 @@ STATICFILES_DIRS = [
     PROJECT_ROOT / "static",
 ]
 
+FAVICON_PATH = 'images/favicon.ico'
+
 # Locale/Internationalization
 TIME_ZONE = 'America/New_York'   # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 LANGUAGE_CODE = 'en'   # http://www.i18nguy.com/unicode/language-identifiers.html
diff --git a/lms/templates/main.html b/lms/templates/main.html
index d6cbe21095..f97c173d0d 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -33,7 +33,7 @@
   })(this);
   </script>
 
-  <link rel="icon" type="image/x-icon" href="${static.url('images/favicon.ico')}" />
+  <link rel="icon" type="image/x-icon" href="${static.url(settings.FAVICON_PATH)}" />
 
   <%static:css group='application'/>