diff --git a/config/galaxy.yml.sample b/config/galaxy.yml.sample
index 8830d718925..3fd8f62d22e 100644
--- a/config/galaxy.yml.sample
+++ b/config/galaxy.yml.sample
@@ -47,6 +47,9 @@ uwsgi:
   # Mapping to serve the remainder of the static content.
   static-map: /static=static
 
+  # Mapping to serve the favicon.
+  static-map: /favicon.ico=static/favicon.ico
+
   # Enable the master process manager. Disabled by default for maximum
   # compatibility with CTRL+C, but should be enabled for use with
   # --daemon and/or production deployments.
diff --git a/config/reports.yml.sample b/config/reports.yml.sample
index 17c9c51664f..aa6fc445e21 100644
--- a/config/reports.yml.sample
+++ b/config/reports.yml.sample
@@ -29,6 +29,9 @@ uwsgi:
   # Mapping to serve the remainder of the static content.
   static-map: /static=static
 
+  # Mapping to serve the favicon.
+  static-map: /favicon.ico=static/favicon.ico
+
   # Enable the master process manager. Disabled by default for maximum
   # compatibility with CTRL+C, but should be enabled for use with
   # --daemon and/or production deployments.
diff --git a/config/tool_shed.yml.sample b/config/tool_shed.yml.sample
index 303932bee96..ea86936c839 100644
--- a/config/tool_shed.yml.sample
+++ b/config/tool_shed.yml.sample
@@ -29,6 +29,9 @@ uwsgi:
   # Mapping to serve the remainder of the static content.
   static-map: /static=static
 
+  # Mapping to serve the favicon.
+  static-map: /favicon.ico=static/favicon.ico
+
   # Enable the master process manager. Disabled by default for maximum
   # compatibility with CTRL+C, but should be enabled for use with
   # --daemon and/or production deployments.
diff --git a/lib/galaxy/webapps/config_manage.py b/lib/galaxy/webapps/config_manage.py
index b39a6d6b6d4..3bd5dbc3dbe 100644
--- a/lib/galaxy/webapps/config_manage.py
+++ b/lib/galaxy/webapps/config_manage.py
@@ -85,6 +85,12 @@ UWSGI_OPTIONS = OrderedDict([
         'default': '/static=static',
         'type': 'str',
     }),
+    ('static-map.3', {
+        'key': 'static-map',
+        'desc': """Mapping to serve the favicon.""",
+        'default': '/favicon.ico=static/favicon.ico',
+        'type': 'str',
+    }),
     ('master', {
         'desc': """Enable the master process manager. Disabled by default for maximum compatibility with CTRL+C, but should be enabled for use with --daemon and/or production deployments.""",
         'default': False,
diff --git a/scripts/get_uwsgi_args.py b/scripts/get_uwsgi_args.py
index a915741e41f..5768a406ea0 100644
--- a/scripts/get_uwsgi_args.py
+++ b/scripts/get_uwsgi_args.py
@@ -91,7 +91,8 @@ def _get_uwsgi_args(cliargs, kwargs):
         'buffer-size': '16384',  # https://github.com/galaxyproject/galaxy/issues/1530
         'http': 'localhost:{port}'.format(port=DEFAULT_PORTS[cliargs.app]),
         'static-map': ('/static/style={here}/static/style/blue'.format(here=os.getcwd()),
-                       '/static={here}/static'.format(here=os.getcwd())),
+                       '/static={here}/static'.format(here=os.getcwd()),
+                       '/favicon.ico={here}/static/favicon.ico'.format(here=os.getcwd())),
         'static-safe': ('{here}/config/plugins/visualizations'.format(here=os.getcwd()),
                         '{here}/config/plugins/interactive_environments'.format(here=os.getcwd())),
         'die-on-term': True,