diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index d5ae4167..88b74c33 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -125,6 +125,15 @@ ul#header-nav  a:active {
     height:38px;
     background:url(../images/search-interior-pages.png) 0 0 no-repeat;
 }
+#search-field .submit {
+    text-decoration:none;
+    background-color:transparent;
+    color:#fff;
+    font-size:14px;
+    border:none;
+    padding-left:25px;
+    padding-top:8px;
+}
 input.search-vivo {
     float:left;
     width:290px;
@@ -135,17 +144,6 @@ input.search-vivo {
     margin-left:10px;
     margin-top:5px;
 }
-#search a.submit {
-    float:right;
-    display:block;
-    width:70px;
-    height:25px;
-    font-size:14px;
-    color:#fff;
-    padding-top:8px;
-    padding-left:15px;
-    text-decoration: none;
-}
 #search-form-modifier{
     display:none;
 }
@@ -359,6 +357,15 @@ p.passwordNote{
     height: 44px;
     background: url(../images/search-field-and-button.png) 0 0 no-repeat;
 }
+#search-home-field  .submit {
+    text-decoration:none;
+    background-color:transparent;
+    color:#fff;
+    font-size:18px;
+    border:none;
+    padding-left:40px;
+    padding-top:8px;
+}
 input.search-home-vivo {
     float: left;
     margin: 10px 0 0 8px;
@@ -368,16 +375,6 @@ input.search-home-vivo {
     font-size: 18px;
     color: #5e6363;
 }
-#search-home a.submit {
-    float: right;
-    display: block;
-    width: 80px;
-    height: 20px;
-    font-size: 14;
-    color: #fff;
-    padding-top: 10px;
-    padding-left: 30px;
-}
 /* BROWSE ------>  */
 #browse {
     clear: both;
diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl
index 3c4a9f20..e1efb801 100644
--- a/themes/wilma/templates/menu.ftl
+++ b/themes/wilma/templates/menu.ftl
@@ -51,8 +51,7 @@
                
                 <div id="search-field">
                     <input type="text" name="querytext" class="search-vivo" value="${querytext!}"  />
-               
-                    <a class ="submit" href="javascript:document.search.submit();">Search</a>
+                    <input type="submit" value="Search" class="submit">
                 </div>
             
                 <!-- <input class ="submit" name="submit" type="submit"  value="Search" /> -->
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index 33577c67..0c50fb66 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -71,7 +71,7 @@
                        </#if> 
                        <div id="search-field">
                            <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
-                           <a class ="submit" href="javascript:document.search.submit();">Search</a>
+                           <input type="submit" value="Search" class="submit">
                        </div>
                     </form>
                  </fieldset>
@@ -104,16 +104,16 @@
                         <legend>Search form</legend>
                         <form id="search-home-vivo" action="${urls.search}" method="post" name="searchHome" role="search">
                             <#if user.showFlag1SearchField>
-                                <select id="search-form-modifier2" name="flag1" class="form-item" >
+                                <select id="search-form-modifier" name="flag1" class="form-item" >
                                     <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
                                     <option value="${portalId}">${siteTagline!}</option>
                                 </select>
                             <#else>
-                                <input type="hidden" name="flag1" value="${portalId}" />
+                                <input type="hidden" name="flag1" value="${portalId}" />  
                            </#if> 
                             <div id="search-home-field">
-                                <input name="search-home-vivo" class="search-home-vivo" id="search-home-vivo"  type="text" />
-                                <a class ="submit" href="javascript:document.searchHome.submit();">Search</a>
+                                <input type="text" name="querytext" class="search-home-vivo" value="${querytext!}" />
+                                <input type="submit" value="Search" class="submit">
                             </div>
                         </form>
                     </fieldset>
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index 37354e59..73722e78 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -73,7 +73,7 @@
                         
                         <div id="search-field">
                             <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
-                            <a class ="submit" href="javascript:document.search.submit();">Search</a>
+                            <input type="submit" value="Search" class="submit">
                         </div>
                     </form>
                 </fieldset>