diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index b5176c2e..b2cac2b3 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -56,7 +56,7 @@ select.form-control {
 /* End Reset */
 
 #back {
-	padding: 7px 0px 7px 0px;
+	padding: 0px 0px 7px 0px;
 }
 
 .order-info {
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 172f029f..3a63c080 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -14,11 +14,11 @@
       	<div class="card-title row">
       		<div class="col-lg-6 col-md-6 col-sm-6">
       			<p id="sale-id" class="hidden"><%=@sale_data.sale_id %></p>
-      			<p>Receipt No: <span id="receipt_no"><%=@sale_data.receipt_no rescue ' '%></span></p>
+      			<p class="m-l-10">Receipt No: <span id="receipt_no"><%=@sale_data.receipt_no rescue ' '%></span></p>
       			<!-- <p>Cashier:  <span id="cashier"><%=@sale_data.cashier_name rescue ' '%></span></p> -->
       		</div>
       		<div class="col-lg-6 col-md-6 col-sm-6 text-right">
-      			<p>Date:  <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+      			<p class="m-r-10">Date:  <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
       		</div>
       	</div>
       	<div id="custom-slimscroll">
@@ -132,7 +132,7 @@
 							</div>
 							<div class="col-md-9">
 								<div class="row">
-									<div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
+									<div class="col-md-3 cashier_number" data-value="1" data-type="num" style="margin-left: 6px;">1</div>
 									<div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
 									<div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
 								</div>
@@ -145,7 +145,7 @@
 							</div>
 							<div class="col-md-9">
 								<div class="row">
-									<div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
+									<div class="col-md-3 cashier_number" data-value="4" data-type="num" style="margin-left: 6px;">4</div>
 									<div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
 									<div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
 								</div>
@@ -158,7 +158,7 @@
 							</div>
 							<div class="col-md-9">
 								<div class="row">
-									<div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
+									<div class="col-md-3 cashier_number" data-value="7" data-type="num" style="margin-left: 6px;">7</div>
 									<div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
 									<div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
 								</div>
@@ -171,7 +171,7 @@
 							</div>
 							<div class="col-md-9">
 								<div class="row">
-									<div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
+									<div class="col-md-3 cashier_number" data-value="0" data-type="num" style="margin-left: 6px;">0</div>
 									<div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
 									<div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
 								</div>
@@ -184,7 +184,7 @@
 							</div>
 							<div class="col-md-9">
 								<div class="row">
-									<div class="col-md-3 cashier_number"></div>
+									<div class="col-md-3 cashier_number" style="margin-left: 6px;"></div>
 									<div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
 									<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
 								</div>
@@ -210,9 +210,9 @@
 		<!-- Action Panel -->
 		<div>
 			<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami';"><i class="fa fa-arrow-left"></i> Back </button>
-			<button id="remove-item-discount" class="btn btn-warning btn- action-btn">Remove Item Discount</button>
-			<button id="remove-all" class="btn bg-warning btn-block action-btn">Remove All</button>
-			<button id="pay-discount" class="btn bg-danger btn-block action-btn">Enter</button>
+			<button id="remove-item-discount" class="btn btn-primary btn- action-btn">Remove Item Discount</button>
+			<button id="remove-all" class="btn bg-primary btn-block action-btn">Remove All</button>
+			<button id="pay-discount" class="btn bg-primary btn-block action-btn">Enter</button>
 			<% if @member_discount%>
 			<!-- <hr />		
 			<button id="member-discount" class="btn btn-success btn-block action-btn
diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index 5844dcdc..e4230eba 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -114,9 +114,9 @@
               <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
                 <div class="fluid cashier_number" data-value="3000" data-type="add">3000</div>
               </div>
-              <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
-                <div class="row">
-                  <div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
+              <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number" data-value="1" data-type="num">1</div>
                   <div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
                   <div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
                 </div>
@@ -127,9 +127,9 @@
               <div class="col-md-3">
                 <div class="fluid cashier_number" data-value="5000" data-type="add">5000</div>
               </div>
-              <div class="col-md-9">
-                <div class="row">
-                  <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
+              <div class="col-md-9 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number" data-value="4" data-type="num">4</div>
                 <div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
                 <div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
                 </div>
@@ -140,9 +140,9 @@
               <div class="col-md-3">
                 <div class="fluid cashier_number" data-value="10000" data-type="add">10000</div>
               </div>
-              <div class="col-md-9">
-                <div class="row">
-                  <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
+              <div class="col-md-9 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number" data-value="7" data-type="num">7</div>
                 <div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
                 <div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
                 </div>
@@ -153,9 +153,9 @@
               <div class="col-md-3">
                 <div class="fluid cashier_number" data-value="15000" data-type="add">15000</div>
               </div>
-              <div class="col-md-9">
-                <div class="row">
-                  <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
+              <div class="col-md-9 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number" data-value="0" data-type="num">0</div>
                 <div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
                 <div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
                 </div>
@@ -166,9 +166,9 @@
               <div class="col-md-3">
                 <div class="fluid cashier_number" data-value="20000" data-type="add">20000</div>
               </div>
-              <div class="col-md-9">
-                <div class="row">
-                  <div class="col-md-3 cashier_number"></div>
+              <div class="col-md-9 m-l--5">
+                <div class="row m-l--5">
+                  <div class="col-md-3 left cashier_number"></div>
                 <div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
                 <div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
                 </div>
@@ -177,7 +177,7 @@
             </div>  	          
   				</div>
 
-  				<div class="col-md-3">
+  				<div class="col-md-3 m-l--15">
   					<div class="form-group">
   						<button id="add_charges" class="btn bg-info fluid action-btn">Add</button>						
   						<button id="remove-item" class="btn bg-danger fluid action-btn">Remove</button>
@@ -192,7 +192,7 @@
   <div class="col-lg-1 col-md-1 col-sm-1">
   	<!-- Action Panel -->
   	<div>
-  		<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami';"><i class="fa fa-arrow-left"></i> Back </button>
+  		<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami';"><i class="material-icons">reply</i> Back </button>
   		<button id="charge_other" class="btn bg-success btn-block action-btn">Enter</button>
   	</div>
   </div>
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 22224536..04841e1a 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -9,12 +9,12 @@
       <div class="card-block">
         <div class="card-title row">
           <div class="col-lg-6 col-md-6 col-sm-6">
-            <p> Receipt No: <span id="receipt_no">
+            <p class="m-l-10"> Receipt No: <span id="receipt_no">
                 <%= @saleobj.receipt_no rescue '' %>
              </span></p>
           </div>
           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-            <p>Date:
+            <p class="m-r-10">Date:
               <span id="receipt_date"><%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
             </p>
           </div>
@@ -121,7 +121,7 @@
   <!-- Column Three -->
   <div class="col-lg-2 col-md-2 col-sm-2">
     <!-- Waiter Buttons -->
-    <button type="button" class="btn btn-block btn-lg bg-default waves-effect" id='back'>Back</button>
+    <button type="button" class="btn btn-block btn-lg bg-default waves-effect" id='back'><i class="material-icons">reply</i>Back</button>
     <button type="button" class="btn btn-block btn-lg bg-danger waves-effect" id='cancel_all_void'>Cancel All Void</button>
     <button type="button" class="btn btn-block btn-lg bg-blue waves-effect" id='apply'>Apply</button>
   </div>