diff --git a/webapp/web/admin/sparqlquery/sparqlForm.jsp b/webapp/web/admin/sparqlquery/sparqlForm.jsp
index 81f0f6f75..9727c827f 100644
--- a/webapp/web/admin/sparqlquery/sparqlForm.jsp
+++ b/webapp/web/admin/sparqlquery/sparqlForm.jsp
@@ -88,7 +88,7 @@ try{
 </ul>
 
 </div>
-<input type="submit" value="Run Query" class="green button">
+<input id="submit" type="submit" value="Run Query" />
 </form>
 <%--
 <h4>Notes</h4>
diff --git a/webapp/web/jenaIngest/connectDB.jsp b/webapp/web/jenaIngest/connectDB.jsp
index 02886d7bf..8d0131c52 100644
--- a/webapp/web/jenaIngest/connectDB.jsp
+++ b/webapp/web/jenaIngest/connectDB.jsp
@@ -27,4 +27,4 @@
         </select>
     <p>database type</p>
 
-    <input type="submit" value="Connect Database" class="green button"/>
+    <input id="submit" type="submit" value="Connect Database" />
diff --git a/webapp/web/jenaIngest/createModel.jsp b/webapp/web/jenaIngest/createModel.jsp
index c3ffc5273..61e176a00 100644
--- a/webapp/web/jenaIngest/createModel.jsp
+++ b/webapp/web/jenaIngest/createModel.jsp
@@ -5,6 +5,6 @@
     <form style="margin-bottom:2ex;" action="ingest" method="post">
         <input type="hidden" name="action" value="createModel"/>
 	Model name: <input type="text" size="32" name="modelName"/>
-        <input type="submit" name="submit" value="Create Model"/>
+        <input id="submit" type="submit" name="submit" value="Create Model"/>
         <input type="hidden" name="modelType" value="${modelType}"/>
     </form>
diff --git a/webapp/web/jenaIngest/csv2rdf.jsp b/webapp/web/jenaIngest/csv2rdf.jsp
index 9a5da572b..0dc30cb1d 100644
--- a/webapp/web/jenaIngest/csv2rdf.jsp
+++ b/webapp/web/jenaIngest/csv2rdf.jsp
@@ -70,4 +70,4 @@
     </select>
     <p>Destination Model for TBox</p>
 
-    <input type="submit" value="Convert CSV"/>
+    <input id="submit" type="submit" value="Convert CSV"/>
diff --git a/webapp/web/jenaIngest/executeWorkflow.jsp b/webapp/web/jenaIngest/executeWorkflow.jsp
index d90e08480..c1f199e6a 100644
--- a/webapp/web/jenaIngest/executeWorkflow.jsp
+++ b/webapp/web/jenaIngest/executeWorkflow.jsp
@@ -43,4 +43,4 @@
         %>
         </select>
   
-    <input type="submit" value="Next &gt;"/>
+    <input id="submit" type="submit" value="Next &gt;"/>
diff --git a/webapp/web/jenaIngest/exportSelection.jsp b/webapp/web/jenaIngest/exportSelection.jsp
index e63f59b11..7e81e73d3 100644
--- a/webapp/web/jenaIngest/exportSelection.jsp
+++ b/webapp/web/jenaIngest/exportSelection.jsp
@@ -44,7 +44,7 @@
     <option value="TURTLE">Turtle</option>
 </select>
 
-<input type="submit" name="submit" class="green button" value="Export"/>
+<input id="submit" type="submit" name="submit" value="Export"/>
 
 </form>
 
diff --git a/webapp/web/jenaIngest/generateTBox.jsp b/webapp/web/jenaIngest/generateTBox.jsp
index b14eaf2f9..21fb7e206 100644
--- a/webapp/web/jenaIngest/generateTBox.jsp
+++ b/webapp/web/jenaIngest/generateTBox.jsp
@@ -50,4 +50,4 @@
 %>   
     </select>
 
-    <input type="submit" value="Generate TBox"/>
+    <input id="submit" type="submit" value="Generate TBox"/>
diff --git a/webapp/web/jenaIngest/listModels.jsp b/webapp/web/jenaIngest/listModels.jsp
index 745696b17..644d1c0c7 100644
--- a/webapp/web/jenaIngest/listModels.jsp
+++ b/webapp/web/jenaIngest/listModels.jsp
@@ -34,13 +34,13 @@ function init(){
     <td>
      <form name="sdbform" action="ingest" method="get">
         <input type="hidden" name="action" value="sdbModels"/>
-        <input type="submit" name="submit" value="SDB Models"/>
+        <input id="submit" type="submit" name="submit" value="SDB Models"/>
     </form>
     </td>
     <td>
     <form name="rdbform" action="ingest" method="get">
         <input type="hidden" name="action" value="rdbModels"/>
-        <input type="submit" name="submit" value="RDB Models"/>
+        <input id="submit" type="submit" name="submit" value="RDB Models"/>
     </form>
     </td>
     </tr>
@@ -48,7 +48,7 @@ function init(){
     <form action="ingest" method="get">
         <input type="hidden" name="action" value="createModel"/>
         <input type="hidden" name="modelType" value="${modelType}"/>
-        <input type="submit" name="submit" value="Create Model"/>
+        <input id="submit" type="submit" name="submit" value="Create Model"/>
     </form>
     <form name="information">
     <input type="hidden" name="info" value="${infoLine}"/>
@@ -66,7 +66,7 @@ function init(){
                 <input type="hidden" name="action" value="loadRDFData"/>
                 <input type="hidden" name="modelName" value="<%=modelName%>"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="load RDF data"/>
+                <input id="submit" type="submit" name="submit" value="load RDF data"/>
             </form>
             </td>
             <td>
@@ -81,7 +81,7 @@ function init(){
                 <input type="hidden" name="action" value="clearModel"/>
                 <input type="hidden" name="modelName" value="<%=modelName%>"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="clear statements"/>
+                <input id="submit" type="submit" name="submit" value="clear statements"/>
             </form>
             </td>
             <td>
@@ -89,7 +89,7 @@ function init(){
                 <input type="hidden" name="action" value="removeModel"/>
                 <input type="hidden" name="modelName" value="<%=modelName%>"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="remove"/>
+                <input id="submit" type="submit" name="submit" value="remove"/>
             </form>
             </td>
             </tr>
@@ -99,7 +99,7 @@ function init(){
                 <input type="hidden" name="action" value="attachModel"/>
                 <input type="hidden" name="modelName" value="<%=modelName%>"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="attach to webapp"/>
+                <input id="submit" type="submit" name="submit" value="attach to webapp"/>
             </form>
             </td>
             <td>
@@ -107,7 +107,7 @@ function init(){
                 <input type="hidden" name="action" value="detachModel"/>
                 <input type="hidden" name="modelName" value="<%=modelName%>"/>
                 <input type="hidden" name="modelType" value="${modelType}"/>
-                <input type="submit" name="submit" value="detach from webapp"/>
+                <input id="submit" type="submit" name="submit" value="detach from webapp"/>
             </form>
             </td>
             <td>
@@ -115,7 +115,7 @@ function init(){
 			    <input type="hidden" name="action" value="permanentURI" />
 			    <input type="hidden" name="modelName" value="<%=modelName%>" /> 
 				<input type="hidden" name="modelType" value="${modelType}"/>
-				<input type="submit" name="submit" value="generate permanent URIs" /></form>
+				<input id="submit" type="submit" name="submit" value="generate permanent URIs" /></form>
 			</td>
             <td>&nbsp;</td>
             </tr>
diff --git a/webapp/web/jenaIngest/loadRDFData.jsp b/webapp/web/jenaIngest/loadRDFData.jsp
index 93b985cc7..c326cd0d4 100644
--- a/webapp/web/jenaIngest/loadRDFData.jsp
+++ b/webapp/web/jenaIngest/loadRDFData.jsp
@@ -18,5 +18,5 @@
 </select>
 <br></br>
 <br></br>
-<p><input type="submit" name="submit" value="Load Data" /></p>
+<p><input id="submit" type="submit" name="submit" value="Load Data" /></p>
 </form>
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/mergeIndividuals.jsp b/webapp/web/jenaIngest/mergeIndividuals.jsp
index 6de9e1f31..66d6119f6 100644
--- a/webapp/web/jenaIngest/mergeIndividuals.jsp
+++ b/webapp/web/jenaIngest/mergeIndividuals.jsp
@@ -39,6 +39,6 @@
     <td>Duplicate individual URI</td><td><input id="uri2" type="text" size="52" name="uri2"/></td>
 </tr>
 </table>
-<input type="submit" name="submit" value="Merge individuals" /></p>
+<input id="submit"type="submit" name="submit" value="Merge individuals" /></p>
 </form>
 
diff --git a/webapp/web/jenaIngest/merge_result.jsp b/webapp/web/jenaIngest/merge_result.jsp
index afd8dedf4..e3c469014 100644
--- a/webapp/web/jenaIngest/merge_result.jsp
+++ b/webapp/web/jenaIngest/merge_result.jsp
@@ -18,7 +18,7 @@ if(!result.equals("No statements merged") && !result.endsWith("statements.")){%>
 <TR>
                 <br>
                  <p>Download non-mergeable statements.</p>
-                 <p><input type="submit" name="Download" value="Download" ></input></p>
+                 <p><input id="submit"  type="submit" name="Download" value="Download" ></input></p>
                 <br>
   </TR>
 <%}} %>
diff --git a/webapp/web/jenaIngest/permanentURI.jsp b/webapp/web/jenaIngest/permanentURI.jsp
index c3aa9b2bd..cbd522a34 100644
--- a/webapp/web/jenaIngest/permanentURI.jsp
+++ b/webapp/web/jenaIngest/permanentURI.jsp
@@ -58,5 +58,5 @@ Or <%String defaultNamespace = (String)request.getAttribute("defaultNamespace");
 <p>Use default namespace <%=defaultNamespace%>  <input type="checkbox" name="defaultNamespace" value ="<%=defaultNamespace%>"/>
 </p>
 
-<p><input type="submit" name="submit" value="Generate URIs" /></p>
+<p><input id="submit" type="submit" name="submit" value="Generate URIs" /></p>
 </form>
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/processStrings.jsp b/webapp/web/jenaIngest/processStrings.jsp
index 43b07ecff..31a028a75 100644
--- a/webapp/web/jenaIngest/processStrings.jsp
+++ b/webapp/web/jenaIngest/processStrings.jsp
@@ -70,4 +70,4 @@
 	</select>
     <p>model in which to save retracted statements</p>
 
-    <input type="submit" value="Process property values"/>
+    <input id="submit" type="submit" value="Process property values"/>
diff --git a/webapp/web/jenaIngest/renameBNodes.jsp b/webapp/web/jenaIngest/renameBNodes.jsp
index 6623c6b19..dc2cb7e6c 100644
--- a/webapp/web/jenaIngest/renameBNodes.jsp
+++ b/webapp/web/jenaIngest/renameBNodes.jsp
@@ -57,4 +57,4 @@
 %>   
     </select>
 
-    <input type="submit" value="Rename Blank Nodes"/>
+    <input id="submit" type="submit" value="Rename Blank Nodes"/>
diff --git a/webapp/web/jenaIngest/renameResource.jsp b/webapp/web/jenaIngest/renameResource.jsp
index ffa18af87..b5c23dd59 100644
--- a/webapp/web/jenaIngest/renameResource.jsp
+++ b/webapp/web/jenaIngest/renameResource.jsp
@@ -25,5 +25,5 @@ to follow the established "n" + random integer naming convention.</p>
 <input type="hidden" name="action" value="renameResource"/>
 <p>Old Namespace  <input id="uri1" type="text" size="52" name="uri1"/></p>
 <p>New Namespace  <input id="uri2" type="text" size="52" name="uri2"/></p>
-<p><input type="submit" name="submit" value="Change namespace" /></p>
+<p><input id="submit" type="submit" name="submit" value="Change namespace" /></p>
 </form>
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/smushSingleModel.jsp b/webapp/web/jenaIngest/smushSingleModel.jsp
index bba659a81..23d6d779c 100644
--- a/webapp/web/jenaIngest/smushSingleModel.jsp
+++ b/webapp/web/jenaIngest/smushSingleModel.jsp
@@ -53,4 +53,4 @@
 %>   
     </select>
 
-    <input type="submit" value="Smush Resources"/>
+    <input id="submit" type="submit" value="Smush Resources"/>
diff --git a/webapp/web/jenaIngest/sparqlConstruct.jsp b/webapp/web/jenaIngest/sparqlConstruct.jsp
index abb71873a..044b2c070 100644
--- a/webapp/web/jenaIngest/sparqlConstruct.jsp
+++ b/webapp/web/jenaIngest/sparqlConstruct.jsp
@@ -182,4 +182,4 @@ PREFIX <%=prefixText%>: <<%=urlText%>><%}}%>
 		<p><input type="checkbox" name="reasoning" value="pellet" />
 		include Pellet OWL-DL reasoning</p>
 	</c:otherwise>
-</c:choose> <input type="submit" value="Execute CONSTRUCT" />
\ No newline at end of file
+</c:choose> <input id="submit" type="submit" value="Execute CONSTRUCT" />
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/splitPropertyValues.jsp b/webapp/web/jenaIngest/splitPropertyValues.jsp
index 2cfc3bbf3..c42c62c39 100644
--- a/webapp/web/jenaIngest/splitPropertyValues.jsp
+++ b/webapp/web/jenaIngest/splitPropertyValues.jsp
@@ -62,4 +62,4 @@
 %>   
     </select>
 
-    <input type="submit" value="Split Values"/>
+    <input id="submit" type="submit" value="Split Values"/>
diff --git a/webapp/web/jenaIngest/subtractModels.jsp b/webapp/web/jenaIngest/subtractModels.jsp
index 48817887f..eed495a6d 100644
--- a/webapp/web/jenaIngest/subtractModels.jsp
+++ b/webapp/web/jenaIngest/subtractModels.jsp
@@ -61,4 +61,4 @@
 	</select>
     <p>model in which difference should be saved</p>
 
-    <input type="submit" value="Subtract models"/>
+    <input id="submit" type="submit" value="Subtract models"/>
diff --git a/webapp/web/jenaIngest/workflowStep.jsp b/webapp/web/jenaIngest/workflowStep.jsp
index 7414d167c..94a2491ef 100644
--- a/webapp/web/jenaIngest/workflowStep.jsp
+++ b/webapp/web/jenaIngest/workflowStep.jsp
@@ -46,4 +46,4 @@
         %>
         </select>
   
-    <input type="submit" value="Execute Workflow"/>
+    <input id="submit" type="submit" value="Execute Workflow"/>
diff --git a/webapp/web/jenaIngest/xmlFileUpload.jsp b/webapp/web/jenaIngest/xmlFileUpload.jsp
index 1d99efb1d..d17cc799d 100644
--- a/webapp/web/jenaIngest/xmlFileUpload.jsp
+++ b/webapp/web/jenaIngest/xmlFileUpload.jsp
@@ -33,6 +33,6 @@
 
         <p>Destination model</p>
 
-        <input type="submit" name="submit" value="upload XML and convert to RDF"/>
+        <input id="submit" type="submit" name="submit" value="upload XML and convert to RDF"/>
     </form>
     
diff --git a/webapp/web/templates/edit/specific/upload_rdf.jsp b/webapp/web/templates/edit/specific/upload_rdf.jsp
index 683154c08..df6211e73 100644
--- a/webapp/web/templates/edit/specific/upload_rdf.jsp
+++ b/webapp/web/templates/edit/specific/upload_rdf.jsp
@@ -44,7 +44,7 @@
       </p>
     </c:if>
 
-    <p><input type="submit" name="submit" value="submit"/></p>     
+    <p><input id="submit" type="submit" name="submit" value="submit"/></p>     
 </form>
 
 </div>
diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
index 616fab8c8..1acf615e7 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
@@ -46,7 +46,7 @@
         <textarea name="s34gfd88p9x1" rows="10" cols="90"></textarea>
         
         <div class="buttons">
-            <input type="submit" value="Send Mail" class="green button"/>
+            <input id="submit" type="submit" value="Send Mail"/>
         </div
 
         <p style="font-weight: bold; margin-top: 1em">Thank you!</p>
diff --git a/webapp/web/templates/freemarker/body/search/search-form.ftl b/webapp/web/templates/freemarker/body/search/search-form.ftl
index 15c23e9a6..b0d06b1ca 100644
--- a/webapp/web/templates/freemarker/body/search/search-form.ftl
+++ b/webapp/web/templates/freemarker/body/search/search-form.ftl
@@ -6,7 +6,7 @@
         <form name="filterForm" method="post" action="search">
             <h3>Search</h3>
             <input class="top_padded" name="querytext" value="" type="text" size="50" />
-            <p><input class="form-button" value="Search" type="submit"/></p>
+            <p><input id="submit" value="Search" type="submit"/></p>
         </form>     
     </div><!--advancedSearchForm-->