diff --git a/applications/luci-upnp/luasrc/view/upnp_status.htm b/applications/luci-upnp/luasrc/view/upnp_status.htm
index 89857d542b..dcac8b46e4 100644
--- a/applications/luci-upnp/luasrc/view/upnp_status.htm
+++ b/applications/luci-upnp/luasrc/view/upnp_status.htm
@@ -35,7 +35,7 @@
 						tr.insertCell(-1).innerHTML = st[i].intport;
 
 						tr.insertCell(-1).innerHTML = String.format(
-							'<input class="cbi-input-remove" type="button" value="<%:Delete Redirect%>" onclick="upnp_delete_fwd(%d)" />',
+							'<input class="cbi-button cbi-input-remove" type="button" value="<%:Delete Redirect%>" onclick="upnp_delete_fwd(%d)" />',
 								st[i].num
 						);
 					}
diff --git a/libs/web/luasrc/view/cbi/button.htm b/libs/web/luasrc/view/cbi/button.htm
index 88e63d59df..30f8ddfda5 100644
--- a/libs/web/luasrc/view/cbi/button.htm
+++ b/libs/web/luasrc/view/cbi/button.htm
@@ -1,6 +1,6 @@
 <%+cbi/valueheader%>
 	<% if self:cfgvalue(section) ~= false then %>
-		<input class="cbi-input-<%=self.inputstyle or "button" %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> />
+		<input class="cbi-button cbi-input-<%=self.inputstyle or "button" %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> />
 	<% else %>
 		-
 	<% end %>
diff --git a/libs/web/luasrc/view/cbi/upload.htm b/libs/web/luasrc/view/cbi/upload.htm
index d57a032c77..7770934111 100644
--- a/libs/web/luasrc/view/cbi/upload.htm
+++ b/libs/web/luasrc/view/cbi/upload.htm
@@ -7,7 +7,7 @@
 	<% if s then %>
 		<%:Uploaded File%> (<%=t.byte_format(s.size)%>)
 		<input type="hidden"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> />
-		<input class="cbi-input-image" type="image" value="<%:Replace entry%>" name="cbi.rlf.<%=section .. "." .. self.option%>" alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" />
+		<input class="cbi-button cbi-input-image" type="image" value="<%:Replace entry%>" name="cbi.rlf.<%=section .. "." .. self.option%>" alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" />
 	<% else %>
 		<input class="cbi-input-file" type="file"<%= attr("name", cbid) .. attr("id", cbid) %> />
 	<% end %>
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
index 4dea9bacc8..248d0dbab3 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -129,7 +129,7 @@ $Id$
 	</form>
 	<form class="inline" action="<%=REQUEST_URI%>" method="get">
 		<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-		<input class="cbi-input-find" type="submit" value="<%:Repeat scan%>" />
+		<input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>" />
 	</form>
 </div>
 
diff --git a/modules/admin-full/luasrc/view/admin_system/backup.htm b/modules/admin-full/luasrc/view/admin_system/backup.htm
index a28d2b8066..47b513bd2f 100644
--- a/modules/admin-full/luasrc/view/admin_system/backup.htm
+++ b/modules/admin-full/luasrc/view/admin_system/backup.htm
@@ -34,7 +34,7 @@ $Id$
 		<input type="file" size="30" name="archive" />
 	</div>
 	<div>
-		<input type="submit" class="cbi-input-apply" value="<%:Restore backup%>" />
+		<input type="submit" class="cbi-button cbi-input-apply" value="<%:Restore backup%>" />
 	</div>
 </form>
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 524eb4d8b4..51a1211712 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -51,7 +51,7 @@ local filter = { }
 					<label class="cbi-value-title"><%:Download and install package%>:</label>
 					<div class="cbi-value-field">
 						<input type="text" name="url" size="30" value="" />
-						<input class="cbi-input-save" type="submit" name="submit" value="<%:OK%>" />
+						<input class="cbi-button cbi-input-save" type="submit" name="submit" value="<%:OK%>" />
 					</div>
 				</div>
 
@@ -59,7 +59,7 @@ local filter = { }
 					<label class="cbi-value-title"><%:Filter%>:</label>
 					<div class="cbi-value-field">
 						<input type="text" name="query" size="20" value="<%=pcdata(query)%>" />
-						<input type="submit" class="cbi-input-find" name="search" value="<%:Find package%>" />
+						<input type="submit" class="cbi-button cbi-input-find" name="search" value="<%:Find package%>" />
 					</div>
 				</div>
 			</fieldset>
diff --git a/modules/admin-mini/luasrc/view/mini/backup.htm b/modules/admin-mini/luasrc/view/mini/backup.htm
index a28d2b8066..47b513bd2f 100644
--- a/modules/admin-mini/luasrc/view/mini/backup.htm
+++ b/modules/admin-mini/luasrc/view/mini/backup.htm
@@ -34,7 +34,7 @@ $Id$
 		<input type="file" size="30" name="archive" />
 	</div>
 	<div>
-		<input type="submit" class="cbi-input-apply" value="<%:Restore backup%>" />
+		<input type="submit" class="cbi-button cbi-input-apply" value="<%:Restore backup%>" />
 	</div>
 </form>
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/modules/freifunk/luasrc/view/cbi/osmll_value.htm b/modules/freifunk/luasrc/view/cbi/osmll_value.htm
index c368b67bdf..78b4dff91f 100644
--- a/modules/freifunk/luasrc/view/cbi/osmll_value.htm
+++ b/modules/freifunk/luasrc/view/cbi/osmll_value.htm
@@ -19,7 +19,7 @@ $Id$
 		<% end %>
 
 		<% if self.popup then %>
-			<input class="cbi-input-button" type="button"<%= attr("name", cbid..".button")..attr("id", cbid..".button")..attr("value", self.displaytext)%> 
+			<input class="cbi-button cbi-input-button" type="button"<%= attr("name", cbid..".button")..attr("id", cbid..".button")..attr("value", self.displaytext)%> 
 					onclick="
 						popup=window.open('/luci-static/resources/OSMLatLon.htm', '<%=cbid%>.window', 'innerWidth=<%=self.width%>, innerHeight=<%=self.height%>, location=no, menubar=no, scrollbars=no, status=no, toolbar=no');
 						popup.focus();
@@ -28,7 +28,7 @@ $Id$
 	</div>
 	<div>		
 		<% else %>
-			<input class="cbi-input-button" type="button"<%= attr("name", cbid..".displayosm")..attr("id", cbid..".displayosm")..attr("value", self.displaytext)%> 
+			<input class="cbi-button cbi-input-button" type="button"<%= attr("name", cbid..".displayosm")..attr("id", cbid..".displayosm")..attr("value", self.displaytext)%> 
 					onclick="
 						document.getElementById('<%=cbid..".hideosm"%>').style.display='inline';
 						document.getElementById('<%=cbid..".displayosm"%>').style.display='none';
@@ -40,7 +40,7 @@ $Id$
                                                 }
 					"
 			/>
-			<input class="cbi-input-button" style="display:none" type="button"<%= attr("name", cbid..".hideosm")..attr("id", cbid..".hideosm")..attr("value", self.hidetext)%> 
+			<input class="cbi-button cbi-input-button" style="display:none" type="button"<%= attr("name", cbid..".hideosm")..attr("id", cbid..".hideosm")..attr("value", self.hidetext)%> 
 					onclick="
 						document.getElementById('<%=cbid..".displayosm"%>').style.display='inline';
 						document.getElementById('<%=cbid..".hideosm"%>').style.display='none';
diff --git a/modules/niu/luasrc/view/niu/system/backup.htm b/modules/niu/luasrc/view/niu/system/backup.htm
index 7e8c728236..d380f006e2 100644
--- a/modules/niu/luasrc/view/niu/system/backup.htm
+++ b/modules/niu/luasrc/view/niu/system/backup.htm
@@ -34,8 +34,8 @@ $Id$
 		<input type="file" size="30" name="archive" />
 	</div>
 	<div>
-		<input type="submit" name="cancel" class="cbi-input-cancel" value="<%:Cancel%>" />
-		<input type="submit" class="cbi-input-apply" value="<%:Restore backup%>" />
+		<input type="submit" name="cancel" class="cbi-button cbi-input-cancel" value="<%:Cancel%>" />
+		<input type="submit" class="cbi-button cbi-input-apply" value="<%:Restore backup%>" />
 	</div>
 </form>
-<%+footer%>
\ No newline at end of file
+<%+footer%>