diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index f9629e1b057..5347a102d18 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="45.0" width="516" height="757"/>
+      <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -17,32 +17,32 @@
     <blockTableStyle id="packing_ref_header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="packing_ref_content_table">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Move_Line_Header_Table">
+    <blockTableStyle id="Move_Line_Header">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -51,7 +51,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Move_Line_Table_Content">
+    <blockTableStyle id="Move_Line_Contect">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -64,11 +64,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" rightIndent="0.0" leftIndent="7.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Times-Roman" fontSize="2.0" leading="3"/>
-    <paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -76,7 +71,7 @@
     <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Times-Roman"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -95,55 +90,52 @@
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Untitled1" rightIndent="0.0" leftIndent="42.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
   <story>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">[[ repeatIn(objects,'picking') ]]</para>
+    <para style="Standard">[[ repeatIn(objects,'picking') ]]</para>
     <para style="terp_header_Centre">Packing List </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="284.0,232.0" style="Shipping_Address_tbl">
+    <blockTable colWidths="269.0,269.0" style="Shipping_Address_tbl">
       <tr>
         <td>
-          <para style="P1">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Shipping Address:</para>
-          <para style="terp_default_8">[[ picking.address_id.partner_id.title ]][[ picking.address_id.partner_id.name ]]</para>
-          <para style="terp_default_8">[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
-          <para style="terp_default_8">[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]]</para>
+          <para style="terp_default_9">[[ picking.address_id.partner_id.title ]][[ picking.address_id.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]]</para>
           <para style="terp_default_8">[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]][[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]][[ (picking.address_id.state_id and picking.address_id.state_id.name) or '' ]][[ (picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
+    <para style="terp_default_Bold_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_default_Bold_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_default_Bold_8">
       <font color="white"> </font>
     </para>
     <para style="terp_default_9"><font face="Helvetica">Recipient</font><font face="Helvetica">:</font><font face="Times-Roman"/>[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] </para>
     <para style="terp_default_9">Concerns: [[ picking.name ]]</para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="200.0,190.0,126.0" style="packing_ref_header">
+    <blockTable colWidths="202.0,202.0,124.0" style="packing_ref_header">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Customer Ref.</para>
@@ -156,7 +148,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="200.0,190.0,126.0" style="packing_ref_content_table">
+    <blockTable colWidths="202.0,201.0,124.0" style="packing_ref_content_table">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ (picking.address_id.partner_id.id) or '' ]]</para>
@@ -165,30 +157,23 @@
           <para style="terp_default_Centre_8">[[ picking.date ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">
+          <para style="terp_default_Centre_9">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-    </para>
-    <blockTable colWidths="145.0,165.0,45.0,50.0,111.0" repeatRows="1" style="Move_Line_Header_Table">
+    <blockTable colWidths="118.0,59.0,49.0,66.0,236.0" repeatRows="1" style="Move_Line_Header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
         </td>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
         <td>
           <para style="terp_tblheader_Details">Tracking</para>
         </td>
@@ -198,73 +183,42 @@
         <td>
           <para style="terp_tblheader_Details">Location</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
       </tr>
     </blockTable>
     <section>
-      <para style="P4">[[ repeatIn(picking.move_lines,'move_lines') ]]</para>
-      <blockTable colWidths="144.0,166.0,44.0,16.0,35.0,110.0" style="Move_Line_Table_Content">
+      <para style="Text body">
+        <font face="Times-Roman">[[ repeatIn(picking.move_lines,'move_lines') ]]</font>
+      </para>
+      <blockTable colWidths="118.0,59.0,20.0,29.0,65.0,235.0" style="Move_Line_Contect">
         <tr>
           <td>
-            <para style="terp_default_8">[[ move_lines.product_id.default_code ]]</para>
+            <para style="terp_default_9">[[ move_lines.product_id.default_code ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ move_lines.product_id.name ]]</para>
+            <para style="terp_default_9">[[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']]</para>
+            <para style="terp_default_9">[[ move_lines.product_qty ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ move_lines.product_qty ]]</para>
+            <para style="terp_default_9">
+              <font face="Helvetica">[[ move_lines.product_uom.name ]]</font>
+            </para>
           </td>
           <td>
-            <para style="P5">[[ move_lines.product_uom.name ]]</para>
+            <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+            <para style="terp_default_9">[[ move_lines.product_id.name ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="P2">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
-    <para style="P3">
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-    </para>
-    <para style="Standard">
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
   </story>
 </document>