diff --git a/cms/envs/common.py b/cms/envs/common.py
index 3c3e6bb67e..94a974aa84 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -166,7 +166,7 @@ from openedx.core.release import doc_version
 
 # Dummy secret key for dev/test
 SECRET_KEY = 'dev key'
-
+FAVICON_PATH = 'images/favicon.ico'
 STUDIO_NAME = _("Your Platform Studio")
 STUDIO_SHORT_NAME = _("Studio")
 FEATURES = {
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 47610d1710..c8d2a33309 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -61,7 +61,7 @@ from openedx.core.release import RELEASE_LINE
     <script type="text/javascript" src="${static.url(jsi18n_path)}"></script>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="path_prefix" content="${EDX_ROOT_URL}">
-
+    <link rel="icon" type="image/x-icon" href="${static.url(static.get_value('favicon_path', settings.FAVICON_PATH))}" />
     <%static:css group='style-vendor'/>
     <%static:css group='style-vendor-tinymce-content'/>
     <%static:css group='style-vendor-tinymce-skin'/>
diff --git a/themes/edx.org/cms/static/images/favicon.ico b/themes/edx.org/cms/static/images/favicon.ico
new file mode 100644
index 0000000000..748fa9c752
Binary files /dev/null and b/themes/edx.org/cms/static/images/favicon.ico differ