Index: admin_templates/orders/orders_edit_shipping.tpl
===================================================================
--- admin_templates/orders/orders_edit_shipping.tpl	(revision 14387)
+++ admin_templates/orders/orders_edit_shipping.tpl	(working copy)
@@ -226,11 +226,9 @@
 					</inp2:m_RenderElement>
 				</inp2:m_DefineElement>
 
-				<inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" 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"/>
 
-
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate" size="16"/>
-
 			</inp2:m_if>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>