Index: branches/1.0.x/elements/header.elm.tpl
===================================================================
diff -u -N -r14823 -r14832
--- branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14823)
+++ branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14832)
@@ -62,7 +62,7 @@
 
 		<div class="cart">
 			<span class="phone">1-855-WWW-PROS</span>
-				<span class="items"><inp2:ord_ItemsInCart/> Items: <inp2:ord_Field name="SubtotalWithDiscount" currency="selected" decimal_tag="i"/></span>
+				<span class="items"><em id="header-items-in-cart"><inp2:ord_ItemsInCart/></em> Items: <em id="header-cart-subtotal"><inp2:ord_Field name="SubTotal" currency="selected" decimal_tag="i"/></em></span>
 				<span class="delim">|</span>
 				<a href="<inp2:m_Link template='cart' m_cat_id='0' m_cat_page='1'/>">Checkout</a>
 		</div>
Index: branches/1.0.x/elements/ajax/cart_bubble.tpl
===================================================================
diff -u -N -r14798 -r14832
--- branches/1.0.x/elements/ajax/cart_bubble.tpl	(.../cart_bubble.tpl)	(revision 14798)
+++ branches/1.0.x/elements/ajax/cart_bubble.tpl	(.../cart_bubble.tpl)	(revision 14832)
@@ -13,7 +13,8 @@
 <script type="text/javascript">
 	$(document).ready(
 		function () {
-			$('.cart .items').html('<inp2:ord_ItemsInCart/> Items: <inp2:ord_Field name="TotalAmount" currency="selected" decimal_tag="i"/>');
+			$('#header-items-in-cart').html('<inp2:ord_ItemsInCart/>');
+			$('#header-cart-subtotal').html('<inp2:ord_Field name="SubTotal" currency="selected" decimal_tag="i"/>');
 		}
 	)
 </script>
\ No newline at end of file
Index: branches/1.0.x/inc/js/cart_manager.js
===================================================================
diff -u -N -r14798 -r14832
--- branches/1.0.x/inc/js/cart_manager.js	(.../cart_manager.js)	(revision 14798)
+++ branches/1.0.x/inc/js/cart_manager.js	(.../cart_manager.js)	(revision 14832)
@@ -350,7 +350,7 @@
 
 	// update "Total Savings"
 	$('#discount-row').toggle( $discount_total > 0 );
-	$('.price1', '#discount-row').html( this.formatPrice($discount_total) );
+	$('.price2', '#discount-row').html( this.formatPrice($discount_total) );
 
 	// update Coupon Info
 	if ( $data.order['CouponId'] == 0 ) {
@@ -372,6 +372,10 @@
 
 	// update "subtotal"
 	$('#sub-total').html( this.formatPrice($data.order['SubTotal']) );
+
+	// update page header
+	$('#header-items-in-cart').html( $data.order['ItemsInCart'] );
+	$('#header-cart-subtotal').html( this.formatPrice($data.order['SubTotal'], 'i') );
 }
 
 ShopCartManager.prototype.processProductError = function ($error_info, $error_code, $data) {
@@ -440,12 +444,14 @@
 	return $ret;
 }
 
-ShopCartManager.prototype.formatPrice = function ($price) {
-	// TODO: format currency
+ShopCartManager.prototype.formatPrice = function ($price, $decimal_tag) {
+	if ( $decimal_tag === undefined ) {
+		$decimal_tag = 'span';
+	}
 
 	var $price_parts = $price.toFixed(2).toString().split('.');
 
-	return this.currencyMask.replace('%s', $price_parts[0] + '.<span>' + $price_parts[1] + '</span>');
+	return this.currencyMask.replace('%s', $price_parts[0] + '.<' + $decimal_tag + '>' + $price_parts[1] + '</' + $decimal_tag + '>');
 }
 
 ShopCartManager.prototype.getQtyErrorOptions = function ($error_code) {