diff --git a/lib/galaxy/web/buildapp.py b/lib/galaxy/web/buildapp.py
index a2238a464a5..243776d303d 100644
--- a/lib/galaxy/web/buildapp.py
+++ b/lib/galaxy/web/buildapp.py
@@ -84,7 +84,7 @@ def app_factory( global_conf, **kwargs ):
     # Wrap the webapp in some useful middleware
     if kwargs.get( 'middleware', True ):
         webapp = wrap_in_middleware( webapp, global_conf, **kwargs )
-    if kwargs.get( 'static_enabled', True ):
+    if asbool( kwargs.get( 'static_enabled', True ) ):
         webapp = wrap_in_static( webapp, global_conf, **kwargs )
     # Close any pooled database connections before forking
     try:
diff --git a/templates/root/index.mako b/templates/root/index.mako
index d86c68f8ac0..23701151be2 100644
--- a/templates/root/index.mako
+++ b/templates/root/index.mako
@@ -102,7 +102,7 @@
     <div class="unified-panel-header" unselectable="on">
         <div class="unified-panel-header-inner">
             <div style="float: right">
-                <a id="history-options-button" class='panel-header-button' href="${h.url_for( controller='root', action='history_options' )}" target="galaxy_main"><span style="padding:0 20px 0 5px;background:url(${h.url_for( '/images/dropdownarrow.png')}) no-repeat right center;">${_('Options')}</span></a>
+                <a id="history-options-button" class='panel-header-button' href="${h.url_for( controller='root', action='history_options' )}" target="galaxy_main"><span style="padding:0 20px 0 5px;background:url(${h.url_for( '/static/images/dropdownarrow.png')}) no-repeat right center;">${_('Options')}</span></a>
             </div>
             <div class="panel-header-text">${_('History')}</div>
         </div>