diff --git a/modules/purchase_trade/view/coffee_lab_analysis_form.xml b/modules/purchase_trade/view/coffee_lab_analysis_form.xml
index d2350e5..8f45390 100644
--- a/modules/purchase_trade/view/coffee_lab_analysis_form.xml
+++ b/modules/purchase_trade/view/coffee_lab_analysis_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
-<form col="12" col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr">
-    <group id="lab_summary" colspan="12" col="8" panel="summary"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr,min-content,1fr,min-content,1fr">
+<form col="12">
+    <group id="lab_summary" colspan="12" col="8">
         <label name="sample"/>
         <field name="sample"/>
         <label name="lab"/>
@@ -19,10 +17,7 @@
     <button name="cancel" string="Cancel"/>
     <button name="draft" string="Draft"/>
     <newline/>
-    <group id="lab_dates" string="Dates"
-        colspan="6" col="4" panel="card" icon="tryton-date"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr">
+    <group id="lab_dates" string="Dates" colspan="6" col="4">
         <label name="requested_date"/>
         <field name="requested_date"/>
         <label name="sent_date"/>
@@ -32,10 +27,7 @@
         <label name="received_date"/>
         <field name="received_date"/>
     </group>
-    <group id="lab_results" string="Results"
-        colspan="6" col="4" panel="card" icon="tryton-note"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr">
+    <group id="lab_results" string="Results" colspan="6" col="4">
         <label name="report_reference"/>
         <field name="report_reference"/>
         <label name="moisture"/>
@@ -47,9 +39,7 @@
         <label name="cup_score"/>
         <field name="cup_score" width="120" xexpand="0" xfill="0"/>
     </group>
-    <group id="lab_notes" string="Summary"
-        colspan="12" col="1" panel="card" icon="tryton-note"
-        xalign="0" yalign="0" col_widths="1fr">
+    <group id="lab_notes" string="Summary" colspan="12" col="1">
         <field name="result_summary"/>
     </group>
 </form>
diff --git a/modules/purchase_trade/view/coffee_sample_form.xml b/modules/purchase_trade/view/coffee_sample_form.xml
index 8d7a62e..912db8f 100644
--- a/modules/purchase_trade/view/coffee_sample_form.xml
+++ b/modules/purchase_trade/view/coffee_sample_form.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
-<form col="12" col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr">
-    <group id="sample_summary" colspan="12" col="8" panel="summary"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr,min-content,1fr,min-content,1fr">
+<form col="12">
+    <group id="sample_summary" colspan="12" col="8">
         <label name="reference"/>
         <field name="reference"/>
         <label name="state"/>
@@ -22,10 +20,7 @@
     <button name="archive" string="Archive"/>
     <button name="reset_to_requested" string="Reset"/>
     <newline/>
-    <group id="sample_identity" string="Sample identity"
-        colspan="6" col="4" panel="card" icon="tryton-public"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr">
+    <group id="sample_identity" string="Sample identity" colspan="6" col="4">
         <label name="direction"/>
         <field name="direction"/>
         <label name="sample_type"/>
@@ -45,10 +40,7 @@
         <label name="public_coffee_type"/>
         <field name="public_coffee_type"/>
     </group>
-    <group id="sample_lifecycle" string="Lifecycle"
-        colspan="6" col="4" panel="card" icon="tryton-date"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr">
+    <group id="sample_lifecycle" string="Lifecycle" colspan="6" col="4">
         <label name="requested_date"/>
         <field name="requested_date"/>
         <label name="received_date"/>
@@ -66,10 +58,7 @@
         <label name="expires_soon"/>
         <field name="expires_soon"/>
     </group>
-    <group id="sample_storage" string="Sample storage"
-        colspan="6" col="4" panel="card" icon="tryton-archive"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr">
+    <group id="sample_storage" string="Sample storage" colspan="6" col="4">
         <label name="quantity"/>
         <field name="quantity"/>
         <label name="unit"/>
@@ -77,10 +66,7 @@
         <label name="storage_location"/>
         <field name="storage_location"/>
     </group>
-    <group id="sample_quality" string="Quality values"
-        colspan="6" col="4" panel="card" icon="tryton-note"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr">
+    <group id="sample_quality" string="Quality values" colspan="6" col="4">
         <label name="moisture"/>
         <field name="moisture" width="120" xexpand="0" xfill="0"/>
         <label name="screen_size"/>
@@ -92,10 +78,7 @@
         <label name="lab_analysis_status"/>
         <field name="lab_analysis_status"/>
     </group>
-    <group id="sample_lab" string="Lab delegation"
-        colspan="12" col="4" panel="card" icon="tryton-list"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr">
+    <group id="sample_lab" string="Lab delegation" colspan="12" col="4">
         <label name="delegated_to_lab"/>
         <field name="delegated_to_lab"/>
         <label name="lab"/>
@@ -106,15 +89,11 @@
         <field name="lab_analyses" colspan="4" mode="tree,form"
             view_ids="purchase_trade.coffee_lab_analysis_view_tree,purchase_trade.coffee_lab_analysis_view_form"/>
     </group>
-    <group id="sample_cupping" string="Cupping sessions"
-        colspan="12" col="1" panel="card" icon="tryton-list"
-        xalign="0" yalign="0" col_widths="1fr">
+    <group id="sample_cupping" string="Cupping sessions" colspan="12" col="1">
         <field name="cupping_lines" colspan="1" mode="tree"
             view_ids="purchase_trade.coffee_cupping_session_sample_view_tree"/>
     </group>
-    <group id="sample_notes" string="Notes"
-        colspan="12" col="1" panel="card" icon="tryton-note"
-        xalign="0" yalign="0" col_widths="1fr">
+    <group id="sample_notes" string="Notes" colspan="12" col="1">
         <field name="notes"/>
         <field name="decision_note"/>
     </group>
diff --git a/modules/purchase_trade/view/configuration_form.xml b/modules/purchase_trade/view/configuration_form.xml
index ae64135..1c454c0 100644
--- a/modules/purchase_trade/view/configuration_form.xml
+++ b/modules/purchase_trade/view/configuration_form.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0"?>
-<form col="12" col_widths="1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr,1fr">
-    <group id="trade_options" string="Trade options"
-        colspan="12" col="4" panel="summary" icon="tryton-settings"
-        xalign="0" yalign="0"
-        col_widths="min-content,1fr,min-content,1fr">
+<form col="12">
+    <group id="trade_options" string="Trade options" colspan="12" col="4">
         <label name="active_coffee_compatibility"/>
         <field name="active_coffee_compatibility"/>
     </group>
-    <group id="pricing_options" string="Pricing"
-        colspan="12" col="1" panel="card" icon="tryton-public"
-        xalign="0" yalign="0" col_widths="1fr">
+    <group id="pricing_options" string="Pricing" colspan="12" col="1">
         <label name="pricing_rule"/>
         <field name="pricing_rule"/>
     </group>