diff --git a/themes/wilma/templates/edit/formPrefix.jsp b/themes/wilma/templates/edit/formPrefix.jsp
index e99a76c2..77dcac59 100644
--- a/themes/wilma/templates/edit/formPrefix.jsp
+++ b/themes/wilma/templates/edit/formPrefix.jsp
@@ -42,10 +42,10 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
     <link rel="stylesheet" href="<%=themeDir%>css/screen.css" />
     
     <!-- script for enabling new HTML5 semantic markup in IE browsers-->
-    <%-- ${headScripts.add("/js/html5.js")} --%>
     <script language="javascript" type="text/javascript" src="../js/html5.js"></script>
     
     <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
+    
     <%
         String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false";
         if (useTinyMCE.equalsIgnoreCase("true")) {
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index 96ca1e53..441eec46 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -12,13 +12,12 @@
         <title>${title}</title>
         <meta name="description" content="" />
         <meta name="keywords" content="" />
-
-        <#-- ${stylesheets.addFromTheme("/css/screen.css")} -->
+        
         <#include "stylesheets.ftl">
         <link rel="stylesheet" href="${urls.theme}/css/screen.css" />
         
         <#include "headScripts.ftl">
-
+        
         <!--[if lt IE 7]>
         <link rel="stylesheet" href="css/ie6.css" />
         <![endif]-->
@@ -26,7 +25,7 @@
         <!--[if IE 7]>
         <link rel="stylesheet" href="css/ie7.css" />
         <![endif]-->
-
+        
     </head>
     
     <body>
@@ -40,7 +39,7 @@
             <nav role="navigation">
                 <ul id="header-nav" role="list">
                     <#if user.loggedIn>
-                        <li role="listitem"><span class="pictos-arrow-10">U</span> ${user.loginName}</li>
+                        <li role="listitem"><span class="loginIcon">U</span> ${user.loginName}</li>
                         <li role="listitem"><a href="${urls.logout}">Log out</a></li>
                         <#if user.hasSiteAdminAccess>
                             <li role="listitem"><a href="${urls.siteAdmin}">Site Admin</a></li>
@@ -255,7 +254,7 @@
         
         <!--[if lt IE 7]>
         <script type="text/javascript" src="${urls.base}/js/jquery_plugins/supersleight.js"></script>
-        <script type="text/javascript" src="${urls.theme}/js/utils.js"></script>
+        <script type="text/javascript" src="${urls.base}/js/utils.js"></script>
         <![endif]-->
 
         <!--[if (gte IE 6)&(lte IE 8)]>
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index 088698fb..ef84d996 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -12,8 +12,6 @@
         <title>${title}</title>
         <meta name="description" content="" />
         <meta name="keywords" content="" />
-        <#-- mb863 moved css/screen.css to stylesheets.ftl, so the file is at end -->
-        <#-- ${stylesheets.addFromTheme("/css/screen.css")} -->
          
         <#include "stylesheets.ftl">
         <link rel="stylesheet" href="${urls.theme}/css/screen.css" />
@@ -27,7 +25,7 @@
         <!--[if IE 7]>
         <link rel="stylesheet" href="css/ie7.css" />
         <![endif]-->
- 
+        
     </head>
     
     <body>
@@ -41,7 +39,7 @@
             <nav role="navigation">
                 <ul id="header-nav" role="list">
                     <#if user.loggedIn>
-                        <li role="listitem"><span class="pictos-arrow-10">U</span> ${user.loginName}</li>
+                        <li role="listitem"><span class="loginIcon">U</span> ${user.loginName}</li>
                         <li role="listitem"><a href="${urls.logout}">Log out</a></li>
                         <#if user.hasSiteAdminAccess>
                             <li role="listitem"><a href="${urls.siteAdmin}">Site Admin</a></li>
