diff --git a/application/views/configs/barcode_config.php b/application/views/configs/barcode_config.php
index a6337b8d6..4f6273186 100644
--- a/application/views/configs/barcode_config.php
+++ b/application/views/configs/barcode_config.php
@@ -172,7 +172,7 @@ echo form_open('config/save_barcode/',array('id'=>'barcode_config_form'));
                 'name'=>'submit',
                 'id'=>'submit',
                 'value'=>$this->lang->line('common_submit'),
-                'class'=>'submit_button float_right')
+                'class'=>'btn btn-primary btn-sm pull-right')
             );
             ?>
         </fieldset>
diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php
index 15ee4bd43..1ef6edc66 100644
--- a/application/views/configs/general_config.php
+++ b/application/views/configs/general_config.php
@@ -304,7 +304,7 @@ echo form_submit(array(
 	'name'=>'submit_form',
 	'id'=>'submit_form',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/configs/locale_config.php b/application/views/configs/locale_config.php
index ff9bd2794..538cd975b 100644
--- a/application/views/configs/locale_config.php
+++ b/application/views/configs/locale_config.php
@@ -199,7 +199,7 @@ echo form_submit(array(
 	'name'=>'submit_form',
 	'id'=>'submit_form',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/configs/receipt_config.php b/application/views/configs/receipt_config.php
index f06524d94..d55ba7043 100644
--- a/application/views/configs/receipt_config.php
+++ b/application/views/configs/receipt_config.php
@@ -177,7 +177,7 @@ echo form_submit(array(
 	'name'=>'submit_form',
 	'id'=>'submit_form',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/configs/stock_config.php b/application/views/configs/stock_config.php
index 7baa6ff4e..427b69d3c 100644
--- a/application/views/configs/stock_config.php
+++ b/application/views/configs/stock_config.php
@@ -17,7 +17,7 @@ echo form_open('config/save_locations/',array('id'=>'location_config_form'));
                 'name'=>'submit',
                 'id'=>'submit',
                 'value'=>$this->lang->line('common_submit'),
-                'class'=>'submit_button float_right')
+                'class'=>'btn btn-primary btn-sm pull-right')
             );
             ?>
         </fieldset>
diff --git a/application/views/customers/excel_import.php b/application/views/customers/excel_import.php
index 6fbf49eb5..275bb7865 100644
--- a/application/views/customers/excel_import.php
+++ b/application/views/customers/excel_import.php
@@ -23,7 +23,7 @@ echo form_submit(array(
 	'name'=>'submitf',
 	'id'=>'submitf',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/customers/form.php b/application/views/customers/form.php
index 2cfe397f3..90c604780 100644
--- a/application/views/customers/form.php
+++ b/application/views/customers/form.php
@@ -41,7 +41,7 @@ echo form_submit(array(
 	'name'=>'submit',
 	'id'=>'submit',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/employees/form.php b/application/views/employees/form.php
index 699f23884..144a6ef0f 100644
--- a/application/views/employees/form.php
+++ b/application/views/employees/form.php
@@ -91,7 +91,7 @@ echo form_submit(array(
 	'name'=>'submit',
 	'id'=>'submit',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 
 ?>
diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index f40b39754..6f8b773d8 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -44,7 +44,7 @@ echo form_submit(array(
 	'name'=>'submit',
 	'id'=>'submit',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/item_kits/form.php b/application/views/item_kits/form.php
index 2acd0ad56..b3129d800 100644
--- a/application/views/item_kits/form.php
+++ b/application/views/item_kits/form.php
@@ -64,7 +64,7 @@ echo form_submit(array(
 	'name'=>'submit',
 	'id'=>'submit',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/items/excel_import.php b/application/views/items/excel_import.php
index db29d331a..da2f38d3e 100644
--- a/application/views/items/excel_import.php
+++ b/application/views/items/excel_import.php
@@ -23,7 +23,7 @@ echo form_submit(array(
 	'name'=>'submitf',
 	'id'=>'submitf',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/items/form.php b/application/views/items/form.php
index f5b37d11a..bb0e44de6 100644
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -244,13 +244,13 @@ echo form_submit(array(
 	'name'=>'submit',
 	'id'=>'submit',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 echo form_submit(array(
 		'name'=>'continue',
 		'id'=>'continue',
 		'value'=>$this->lang->line('common_new'),
-		'class'=>'submit_button float_right')
+		'class'=>'btn btn-default btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index 9fed7b48f..4e2322699 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -145,7 +145,7 @@ echo form_submit(array(
 	'name'=>'submit',
 	'id'=>'submit',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/items/inventory.php b/application/views/items/inventory.php
index 54635b434..49fff5fd8 100644
--- a/application/views/items/inventory.php
+++ b/application/views/items/inventory.php
@@ -118,7 +118,7 @@ echo form_submit(array(
 	'name'=>'submit',
 	'id'=>'submit',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>
diff --git a/application/views/receivings/form.php b/application/views/receivings/form.php
index 096a673cf..70afe9127 100755
--- a/application/views/receivings/form.php
+++ b/application/views/receivings/form.php
@@ -51,7 +51,7 @@
 		<?php echo form_submit(array(
 			'name'=>'submit',
 			'value'=>$this->lang->line('common_submit'),
-			'class'=> 'btn btn-xs btn-success float_right')
+			'class'=> 'btn btn-primary btn-sm pull-right')
 		);
 		?>
 		</form>
@@ -61,7 +61,7 @@
 			<?php echo form_submit(array(
 				'name'=>'submit',
 				'value'=>$this->lang->line('recvs_delete_entire_sale'),
-				'class'=>'btn btn-xs btn-danger float_right')
+				'class'=>'btn btn-danger btn-sm pull-right')
 			);
 			?>
 		</form>
diff --git a/application/views/sales/form.php b/application/views/sales/form.php
index e3483b993..05c4d4a3b 100755
--- a/application/views/sales/form.php
+++ b/application/views/sales/form.php
@@ -57,7 +57,7 @@
 		<?php echo form_submit(array(
 			'name'=>'submit',
 			'value'=>$this->lang->line('common_submit'),
-			'class'=> 'btn btn-xs btn-success float_right')
+			'class'=> 'btn btn-primary btn-sm pull-right')
 		);
 		?>
 		</form>
@@ -67,7 +67,7 @@
 			<?php echo form_submit(array(
 				'name'=>'submit',
 				'value'=>$this->lang->line('sales_delete_entire_sale'),
-				'class'=>'btn btn-xs btn-danger float_right')
+				'class'=>'btn btn-danger btn-sm pull-right')
 			);
 			?>
 		</form>
diff --git a/application/views/suppliers/form.php b/application/views/suppliers/form.php
index 4b7b52fc4..0dcbf90c9 100644
--- a/application/views/suppliers/form.php
+++ b/application/views/suppliers/form.php
@@ -44,7 +44,7 @@ echo form_submit(array(
 	'name'=>'submit',
 	'id'=>'submit',
 	'value'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button float_right')
+	'class'=>'btn btn-primary btn-sm pull-right')
 );
 ?>
 </fieldset>