diff --git a/assets/js/form-builder/data/compound-input.json b/assets/js/form-builder/data/compound-input.json
index e335e456..413157cd 100644
--- a/assets/js/form-builder/data/compound-input.json
+++ b/assets/js/form-builder/data/compound-input.json
@@ -12,7 +12,7 @@
 				"value": [
 					{
 						"label": "Small",
-						"value": "input-sm",
+						"value": "sm",
 						"selected": false
 					},{
 						"label": "Normal",
@@ -21,7 +21,7 @@
 					},
 					{
 						"label": "Large",
-						"value": "input-lg",
+						"value": "lg",
 						"selected": false
 					}
 				]
@@ -62,7 +62,7 @@
 				"value": [
 					{
 						"label": "Small",
-						"value": "input-sm",
+						"value": "sm",
 						"selected": false
 					},{
 						"label": "Normal",
@@ -71,7 +71,7 @@
 					},
 					{
 						"label": "Large",
-						"value": "input-lg",
+						"value": "lg",
 						"selected": false
 					}
 				]
@@ -111,7 +111,7 @@
 				"value": [
 					{
 						"label": "Small",
-						"value": "input-sm",
+						"value": "sm",
 						"selected": false
 					},{
 						"label": "Normal",
@@ -120,7 +120,7 @@
 					},
 					{
 						"label": "Large",
-						"value": "input-lg",
+						"value": "lg",
 						"selected": false
 					}
 				]
@@ -166,7 +166,7 @@
 				"value": [
 					{
 						"label": "Small",
-						"value": "input-sm",
+						"value": "sm",
 						"selected": false
 					},{
 						"label": "Normal",
@@ -175,7 +175,7 @@
 					},
 					{
 						"label": "Large",
-						"value": "input-lg",
+						"value": "lg",
 						"selected": false
 					}
 				]
@@ -235,7 +235,7 @@
 				"value": [
 					{
 						"label": "Small",
-						"value": "input-sm",
+						"value": "sm",
 						"selected": false
 					},{
 						"label": "Normal",
@@ -244,7 +244,7 @@
 					},
 					{
 						"label": "Large",
-						"value": "input-lg",
+						"value": "lg",
 						"selected": false
 					}
 				]
@@ -299,7 +299,7 @@
 				"value": [
 					{
 						"label": "Small",
-						"value": "input-sm",
+						"value": "sm",
 						"selected": false
 					},{
 						"label": "Normal",
@@ -308,7 +308,7 @@
 					},
 					{
 						"label": "Large",
-						"value": "input-lg",
+						"value": "lg",
 						"selected": false
 					}
 				]
@@ -363,7 +363,7 @@
 				"value": [
 					{
 						"label": "Small",
-						"value": "input-sm",
+						"value": "sm",
 						"selected": false
 					},{
 						"label": "Normal",
@@ -372,7 +372,7 @@
 					},
 					{
 						"label": "Large",
-						"value": "input-lg",
+						"value": "lg",
 						"selected": false
 					}
 				]
@@ -427,7 +427,7 @@
 				"value": [
 					{
 						"label": "Small",
-						"value": "input-sm",
+						"value": "sm",
 						"selected": false
 					},{
 						"label": "Normal",
@@ -436,7 +436,7 @@
 					},
 					{
 						"label": "Large",
-						"value": "input-lg",
+						"value": "lg",
 						"selected": false
 					}
 				]
diff --git a/assets/js/form-builder/templates/component/appendbuttondropdown.html b/assets/js/form-builder/templates/component/appendbuttondropdown.html
index 24611404..a532196d 100644
--- a/assets/js/form-builder/templates/component/appendbuttondropdown.html
+++ b/assets/js/form-builder/templates/component/appendbuttondropdown.html
@@ -3,9 +3,9 @@
 	<label class="control-label" for="<%= id %>"><%= label %></label>
 	<div class="controls">
 		<div class="input-group">
-			<input id="<%= id %>" name="<%= id %>" class="<%= inputsize %> form-control" placeholder="<%= placeholder %>" type="text" <% if(required) {%> required <% } %> />
+			<input id="<%= id %>" name="<%= id %>" class="input-<%= inputsize %> form-control" placeholder="<%= placeholder %>" type="text" <% if(required) {%> required <% } %> />
 			<div class="input-group-btn">
-				<button class="btn dropdown-toggle" data-toggle="dropdown">
+				<button class="btn dropdown-toggle btn-<%= inputsize %>" data-toggle="dropdown">
 					<%= buttontext %>
 					<span class="caret"></span>
 				</button>
diff --git a/assets/js/form-builder/templates/component/appendcombobox.html b/assets/js/form-builder/templates/component/appendcombobox.html
index 77c1ee1e..48204a9b 100644
--- a/assets/js/form-builder/templates/component/appendcombobox.html
+++ b/assets/js/form-builder/templates/component/appendcombobox.html
@@ -2,9 +2,9 @@
 	<label class="control-label" for="<%= id %>"><%= label %></label>
 	<div class="controls">
 		<div class="input-group input-append dropdown combobox" data-initialize="combobox" id="<%= id %>">
-			<input type="text" class="<%= inputsize %> form-control" placeholder="<%= placeholder %>" name="<%= id %>" <% if(required) {%> required <% } %>>
+			<input type="text" class="input-<%= inputsize %> form-control" placeholder="<%= placeholder %>" name="<%= id %>" <% if(required) {%> required <% } %>>
 			<div class="input-group-btn">
-				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
+				<button type="button" class="btn btn-default dropdown-toggle btn-<%= inputsize %>" data-toggle="dropdown"><span class="caret"></span></button>
 				<ul class="dropdown-menu dropdown-menu-right"><% _.each(buttonoptions, function(value) { %>
 					<li data-value="<%= value %>"><a href="#"><%= value %></a></li><% }); %>
 				</ul>
diff --git a/assets/js/form-builder/templates/component/appendedcheckbox.html b/assets/js/form-builder/templates/component/appendedcheckbox.html
index f11e02b9..a031b549 100644
--- a/assets/js/form-builder/templates/component/appendedcheckbox.html
+++ b/assets/js/form-builder/templates/component/appendedcheckbox.html
@@ -3,7 +3,7 @@
 	<label class="control-label" for="<%= id %>"><%= label %></label>
 	<div class="controls">
 		<div class="input-group">
-			<input type="text" class="form-control <%= inputsize %>" id="<%= id %>" name="<%= id %>" placeholder="<%= placeholder %>" <% if(required) {%> required <% } %> <% if (checked){ %>checked="checked"<% } %>>
+			<input type="text" class="form-control input-<%= inputsize %>" id="<%= id %>" name="<%= id %>" placeholder="<%= placeholder %>" <% if(required) {%> required <% } %> <% if (checked){ %>checked="checked"<% } %>>
 			<label class="input-group-addon checkbox-custom checkbox-inline" data-initialize="checkbox">
 			<input class="sr-only" type="checkbox" value="option1">
 			</label>
diff --git a/assets/js/form-builder/templates/component/appendedsearch.html b/assets/js/form-builder/templates/component/appendedsearch.html
index fbf70548..b7385fbb 100644
--- a/assets/js/form-builder/templates/component/appendedsearch.html
+++ b/assets/js/form-builder/templates/component/appendedsearch.html
@@ -3,9 +3,9 @@
 	<label class="control-label" for="<%= id %>"><%= label %></label>
 	<div class="controls">
 		<div class="search input-group" role="search" id="<%= id %>">
-			<input type="search" class="form-control" placeholder="Search"/>
+			<input type="search" class="form-control input-<%= inputsize %>" placeholder="Search"/>
 			<span class="input-group-btn">
-				<button class="btn btn-default" type="button">
+				<button class="btn btn-default btn-<%= inputsize %>" type="button">
 					<span class="glyphicon glyphicon-search"></span>
 					<span class="sr-only">Search</span>
 				</button>
diff --git a/assets/js/form-builder/templates/component/appendedtext.html b/assets/js/form-builder/templates/component/appendedtext.html
index 2199774f..c14e7a64 100644
--- a/assets/js/form-builder/templates/component/appendedtext.html
+++ b/assets/js/form-builder/templates/component/appendedtext.html
@@ -3,8 +3,8 @@
 	<label class="control-label" for="<%= id %>"><%= label %></label>
 	<div class="controls">
 		<div class="input-group">
-			<input id="<%= id %>" name="<%= id %>" class="<%= inputsize %> form-control" placeholder="<%= placeholder %>" type="text"<% if(required) {%> required <% } %> />
-			<span class="<%= inputsize %> input-group-addon"><%= append %></span>
+			<input id="<%= id %>" name="<%= id %>" class="input-<%= inputsize %> form-control" placeholder="<%= placeholder %>" type="text"<% if(required) {%> required <% } %> />
+			<span class="input-<%= inputsize %> input-group-addon"><%= append %></span>
 		</div>
 		<% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
 	</div>
diff --git a/assets/js/form-builder/templates/component/prependbuttondropdown.html b/assets/js/form-builder/templates/component/prependbuttondropdown.html
index dbf5a6ed..bfe79232 100644
--- a/assets/js/form-builder/templates/component/prependbuttondropdown.html
+++ b/assets/js/form-builder/templates/component/prependbuttondropdown.html
@@ -4,7 +4,7 @@
 	<div class="controls">
 		<div class="input-group">
 			<div class="input-group-btn">
-				<button class="btn dropdown-toggle" data-toggle="dropdown">
+				<button class="btn dropdown-toggle btn-<%= inputsize %>" data-toggle="dropdown">
 					<%= buttontext %>
 					<span class="caret"></span>
 				</button>
@@ -12,7 +12,7 @@
 					<li><a href="#"><%= value %></a></li><% }); %>
 				</ul>
 			</div><!-- /btn-group -->
-			<input id="<%= id %>" name="<%= id %>" class="<%= inputsize %> form-control" placeholder="<%= placeholder %>" type="text" <% if(required) {%> required <% } %> />
+			<input id="<%= id %>" name="<%= id %>" class="input-<%= inputsize %> form-control" placeholder="<%= placeholder %>" type="text" <% if(required) {%> required <% } %> />
 		</div><!-- /input-group -->
 
 		<% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
diff --git a/assets/js/form-builder/templates/component/prependcombobox.html b/assets/js/form-builder/templates/component/prependcombobox.html
index 6328a512..306667f4 100644
--- a/assets/js/form-builder/templates/component/prependcombobox.html
+++ b/assets/js/form-builder/templates/component/prependcombobox.html
@@ -3,12 +3,12 @@
 	<div class="controls">
 		<div class="input-group input-append dropdown combobox" data-initialize="combobox" id="<%= id %>">
 			<div class="input-group-btn">
-				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
+				<button type="button" class="btn btn-default dropdown-toggle btn-<%= inputsize %>" data-toggle="dropdown"><span class="caret"></span></button>
 				<ul class="dropdown-menu dropdown-menu-right"><% _.each(buttonoptions, function(value) { %>
 					<li data-value="<%= value %>"><a href="#"><%= value %></a></li><% }); %>
 				</ul>
 			</div>
-			<input type="text" class="<%= inputsize %> form-control" placeholder="<%= placeholder %>" name="<%= id %>" <% if(required) {%> required <% } %>>
+			<input type="text" class="input-<%= inputsize %> form-control" placeholder="<%= placeholder %>" name="<%= id %>" <% if(required) {%> required <% } %>>
 		</div>
 
 		<% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
diff --git a/assets/js/form-builder/templates/component/prependedcheckbox.html b/assets/js/form-builder/templates/component/prependedcheckbox.html
index 04462360..0af457d2 100644
--- a/assets/js/form-builder/templates/component/prependedcheckbox.html
+++ b/assets/js/form-builder/templates/component/prependedcheckbox.html
@@ -6,7 +6,7 @@
 			<label class="input-group-addon checkbox-custom checkbox-inline" data-initialize="checkbox">
 			<input class="sr-only" type="checkbox" value="option1">
 			</label>
-			<input type="text" class="form-control <%= inputsize %>" id="<%= id %>" name="<%= id %>" placeholder="<%= placeholder %>" <% if(required) {%> required <% } %> <% if (checked){ %>checked="checked"<% } %>>
+			<input type="text" class="form-control input-<%= inputsize %>" id="<%= id %>" name="<%= id %>" placeholder="<%= placeholder %>" <% if(required) {%> required <% } %> <% if (checked){ %>checked="checked"<% } %>>
 		</div>
 
 		<% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
diff --git a/assets/js/form-builder/templates/component/prependedsearch.html b/assets/js/form-builder/templates/component/prependedsearch.html
index 39ab745b..cc9005f5 100644
--- a/assets/js/form-builder/templates/component/prependedsearch.html
+++ b/assets/js/form-builder/templates/component/prependedsearch.html
@@ -4,12 +4,12 @@
 	<div class="controls">
 		<div class="search input-group" role="search" id="<%= id %>">
 			<span class="input-group-btn">
-				<button class="btn btn-default" type="button">
+				<button class="btn btn-default btn-<%= inputsize %>" type="button">
 					<span class="glyphicon glyphicon-search"></span>
 					<span class="sr-only">Search</span>
 				</button>
 			</span>
-			<input type="search" class="<%= inputsize %> form-control" placeholder="Search"/>
+			<input type="search" class="input-<%= inputsize %> form-control" placeholder="Search"/>
 		</div>
 
 		<% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
diff --git a/assets/js/form-builder/templates/component/prependedtext.html b/assets/js/form-builder/templates/component/prependedtext.html
index 63f82eb0..fdebcae9 100644
--- a/assets/js/form-builder/templates/component/prependedtext.html
+++ b/assets/js/form-builder/templates/component/prependedtext.html
@@ -3,8 +3,8 @@
 	<label class="control-label" for="<%= id %>"><%= label %></label>
 	<div class="controls">
 		<div class="input-group">
-			<span class="<%= inputsize %> input-group-addon"><%= prepend %></span>
-			<input id="<%= id %>" name="<%= id %>" class="<%= inputsize %> form-control" placeholder="<%= placeholder %>" type="text"<% if(required) {%> required <% } %> />
+			<span class="input-<%= inputsize %> input-group-addon"><%= prepend %></span>
+			<input id="<%= id %>" name="<%= id %>" class="input-<%= inputsize %> form-control" placeholder="<%= placeholder %>" type="text"<% if(required) {%> required <% } %> />
 		</div>
 		<% if (helptext.length > 0) { %><p class="help-block"><%= helptext %></p><% } %>
 	</div>