Index: branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
diff -u -N -r13100 -r13891
--- branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13891)
@@ -123,7 +123,7 @@
 						<td style="border-right: 1px solid black"><inp2:m_param name="shipment"/></td>
 						<td>
 							<select style="width:230px;" name="<inp2:m_param name="field_name"/>" id="<inp2:m_param name="field_name"/>">
-								<inp2:ord_PrintShippingTypes block="order_shipping_type" />
+								<inp2:ord_PrintShippingTypes block="order_shipping_type" currency="selected"/>
 							</select>
 						</td>
 					</tr>
@@ -153,14 +153,13 @@
 								<td width="45%" style="border-right: 1px solid black"><b><inp2:m_Phrase label="lu_ship_ShippingType" /></b></td>
 							</tr>
 
-							<inp2:ord_PrintShippings block="order_shipment"/>
+							<inp2:ord_PrintShippings block="order_shipment" currency="selected"/>
 						</table>
 					</td>
 				</tr>
 
 				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCost" title="!la_fld_ShippingCost!" size="10"/>
-
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="!la_fld_InsuranceFee!" size="10" format="$ %.2f"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="!la_fld_InsuranceFee!" size="10" currency="selected"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/>
 				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="!la_fld_ShippingDate!" size="16"/>
@@ -199,7 +198,7 @@
 				</inp2:m_DefineElement>
 
 				<inp2:m_DefineElement name="order_shipment_label">
-					<inp2:m_param name="shipment"/> - <inp2:ord_PrintShippingTypes block="order_shipping_type" selected_only="1"/>
+					<inp2:m_param name="shipment"/> - <inp2:ord_PrintShippingTypes block="order_shipping_type" currency="selected" selected_only="1"/>
 				</inp2:m_DefineElement>
 
 				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingOption" title="!la_fld_ShippingOptions!" size="10"/>
@@ -211,7 +210,7 @@
 					</td>
 					<td class="control-mid">&nbsp;</td>
 					<td class="control-cell">
-						<inp2:ord_PrintShippings block="order_shipment_label"/>
+						<inp2:ord_PrintShippings block="order_shipment_label" currency="selected"/>
 					</td>
 				</tr>
 
Index: branches/5.1.x/admin_templates/products/shipping_options.tpl
===================================================================
diff -u -N -r13100 -r13891
--- branches/5.1.x/admin_templates/products/shipping_options.tpl	(.../shipping_options.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/shipping_options.tpl	(.../shipping_options.tpl)	(revision 13891)
@@ -63,7 +63,7 @@
 							<td>
 								<inp2:m_phrase label="la_fld_AvailableShippingTypes"/><br />
 								<select id="available_types" multiple="multiple" size="20" style="width: 200px">
-									<inp2:p_ListShippingTypes render_as="shipping_type"/>
+									<inp2:p_ListShippingTypes mode="available" render_as="shipping_type"/>
 								</select>
 							</td>
 						</tr>