diff --git a/contract/__manifest__.py b/contract/__manifest__.py
index 644a317788..8ca90ff22e 100644
--- a/contract/__manifest__.py
+++ b/contract/__manifest__.py
@@ -11,7 +11,7 @@
 
 {
     "name": "Recurring - Contracts Management",
-    "version": "19.0.1.0.0",
+    "version": "19.0.1.1.3",
     "category": "Contract Management",
     "license": "AGPL-3",
     "author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)",
@@ -39,6 +39,9 @@
         "views/contract_portal_templates.xml",
         "wizards/contract_manually_create_invoice.xml",
     ],
+    "demo": [
+        "demo/contract_demo.xml",
+    ],
     "assets": {
         "web.assets_frontend": ["contract/static/src/scss/frontend.scss"],
         "web.assets_tests": ["contract/static/src/js/contract_portal_tour.esm.js"],
diff --git a/contract/demo/contract_demo.xml b/contract/demo/contract_demo.xml
new file mode 100644
index 0000000000..b00d2cdd69
--- /dev/null
+++ b/contract/demo/contract_demo.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2026 OCA - bosd
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <!--Tags-->
+    <record id="contract_tag_premium" model="contract.tag">
+        <field name="name">Premium</field>
+        <field name="color" eval="2" />
+    </record>
+    <record id="contract_tag_renewal" model="contract.tag">
+        <field name="name">Renewal Required</field>
+        <field name="color" eval="3" />
+    </record>
+    <record id="contract_tag_internal" model="contract.tag">
+        <field name="name">Internal</field>
+        <field name="color" eval="5" />
+    </record>
+
+    <!--Contract Template-->
+    <record id="contract_template_monthly_demo" model="contract.template">
+        <field name="name">Monthly Subscription Template</field>
+        <field name="contract_type">sale</field>
+        <field name="recurring_rule_type">monthly</field>
+        <field name="recurring_invoicing_type">post-paid</field>
+        <field name="recurring_interval">1</field>
+        <field
+            name="contract_line_ids"
+            eval="[
+            Command.create({
+                'display_type': 'line_section',
+                'name': 'Subscription services',
+            }),
+            Command.create({
+                'product_id': ref('product.product_product_5'),
+                'name': 'Service from #START# to #END# (#INVOICEMONTHNAME#)',
+                'quantity': 1,
+                'price_unit': 75.0,
+            }),
+            Command.create({
+                'display_type': 'line_note',
+                'name': 'Cancellation requires 30 days written notice.',
+            }),
+        ]"
+        />
+    </record>
+
+    <!--Running contract: started 6 months ago, ends 6 months from now-->
+    <record id="contract_running_demo" model="contract.contract">
+        <field name="name">Demo Running Contract</field>
+        <field name="code">DEMO/RUN/0001</field>
+        <field name="partner_id" ref="base.res_partner_2" />
+        <field name="contract_type">sale</field>
+        <field name="line_recurrence">True</field>
+        <field
+            name="date_start"
+            eval="(DateTime.now() - relativedelta(months=6)).strftime('%Y-%m-%d')"
+        />
+        <field name="tag_ids" eval="[(6, 0, [ref('contract_tag_premium')])]" />
+        <field
+            name="contract_line_ids"
+            eval="[
+            Command.create({
+                'display_type': 'line_section',
+                'name': 'Recurring services',
+            }),
+            Command.create({
+                'product_id': ref('product.product_product_5'),
+                'name': 'Hosting from #START# to #END# (#INVOICEMONTHNAME#)',
+                'quantity': 1,
+                'price_unit': 120.0,
+                'recurring_rule_type': 'monthly',
+                'recurring_invoicing_type': 'post-paid',
+                'recurring_interval': 1,
+                'date_start': (DateTime.now() - relativedelta(months=6)).strftime('%Y-%m-%d'),
+                'date_end': (DateTime.now() + relativedelta(months=6)).strftime('%Y-%m-%d'),
+                'recurring_next_date': (DateTime.now() + relativedelta(months=1)).strftime('%Y-%m-01'),
+            }),
+        ]"
+        />
+    </record>
+
+    <!--Expired contract: ended last month-->
+    <record id="contract_expired_demo" model="contract.contract">
+        <field name="name">Demo Expired Contract</field>
+        <field name="code">DEMO/EXP/0001</field>
+        <field name="partner_id" ref="base.res_partner_3" />
+        <field name="contract_type">sale</field>
+        <field name="line_recurrence">True</field>
+        <field
+            name="date_start"
+            eval="(DateTime.now() - relativedelta(months=12)).strftime('%Y-%m-%d')"
+        />
+        <field name="tag_ids" eval="[(6, 0, [ref('contract_tag_renewal')])]" />
+        <field
+            name="contract_line_ids"
+            eval="[
+            Command.create({
+                'product_id': ref('product.product_product_5'),
+                'name': 'Service from #START# to #END# (#INVOICEMONTHNAME#)',
+                'quantity': 1,
+                'price_unit': 80.0,
+                'recurring_rule_type': 'monthly',
+                'recurring_invoicing_type': 'post-paid',
+                'recurring_interval': 1,
+                'date_start': (DateTime.now() - relativedelta(months=12)).strftime('%Y-%m-%d'),
+                'date_end': (DateTime.now() - relativedelta(months=1)).strftime('%Y-%m-%d'),
+            }),
+        ]"
+        />
+    </record>
+
+    <!--Upcoming contract: starts next month-->
+    <record id="contract_upcoming_demo" model="contract.contract">
+        <field name="name">Demo Upcoming Contract</field>
+        <field name="code">DEMO/UP/0001</field>
+        <field name="partner_id" ref="base.res_partner_4" />
+        <field name="contract_type">sale</field>
+        <field name="line_recurrence">True</field>
+        <field name="contract_template_id" ref="contract_template_monthly_demo" />
+        <field
+            name="date_start"
+            eval="(DateTime.now() + relativedelta(months=1, day=1)).strftime('%Y-%m-%d')"
+        />
+        <field
+            name="tag_ids"
+            eval="[(6, 0, [ref('contract_tag_premium'), ref('contract_tag_internal')])]"
+        />
+        <field
+            name="contract_line_ids"
+            eval="[
+            Command.create({
+                'product_id': ref('product.product_product_5'),
+                'name': 'Service from #START# to #END# (#INVOICEMONTHNAME#)',
+                'quantity': 2,
+                'price_unit': 100.0,
+                'recurring_rule_type': 'monthly',
+                'recurring_invoicing_type': 'pre-paid',
+                'recurring_interval': 1,
+                'date_start': (DateTime.now() + relativedelta(months=1, day=1)).strftime('%Y-%m-%d'),
+                'date_end': (DateTime.now() + relativedelta(months=13)).strftime('%Y-%m-%d'),
+            }),
+        ]"
+        />
+    </record>
+</odoo>
diff --git a/contract/models/contract.py b/contract/models/contract.py
index 8008e24fa9..b6cbdcd5a2 100644
--- a/contract/models/contract.py
+++ b/contract/models/contract.py
@@ -39,15 +39,23 @@ class ContractContract(models.Model):
         default=lambda self: self.env.user,
     )
     group_id = fields.Many2one(
-        string="Group",
+        string="Analytic Account",
         comodel_name="account.analytic.account",
         compute="_compute_group_id",
         store=True,
         readonly=False,
         ondelete="restrict",
+        help=(
+            "Analytic account shared by every line of this contract. "
+            "Computed from the lines' analytic distribution when all lines "
+            "point at the same account; left empty when the lines use "
+            "different accounts. Stored compute, editable: clearing or "
+            "setting it manually overrides the computed value."
+        ),
     )
     tag_ids = fields.Many2many(comodel_name="contract.tag", string="Tags")
-    note = fields.Text(string="Notes")
+    color = fields.Integer(string="Color Index")
+    note = fields.Html(string="Notes", sanitize=True)
 
     # === Partner and Commercial Info ===
     partner_id = fields.Many2one(
@@ -124,6 +132,13 @@ class ContractContract(models.Model):
 
     # === Dates ===
     date_end = fields.Date(compute="_compute_date_end", store=True, readonly=False)
+    last_date_invoiced = fields.Date(
+        string="Date of Last Invoice",
+        compute="_compute_last_date_invoiced",
+        store=True,
+        readonly=True,
+        copy=False,
+    )
 
     # === Compute Methods ===
 
@@ -210,6 +225,37 @@ def _compute_date_end(self):
             if date_end and all(date_end):
                 contract.date_end = max(date_end)
 
+    @api.constrains("date_start", "date_end")
+    def _check_contract_start_end_dates(self):
+        # When lines are present, the line-level _check_start_end_dates
+        # constraint covers per-line validation, and contract.date_end is
+        # computed from the lines while contract.date_start may legitimately
+        # default to today even for an existing-line contract — so the
+        # contract-level pair is not strictly comparable. An empty date_end
+        # (open-ended contract) is also allowed.
+        for rec in self:
+            if rec.contract_line_ids:
+                continue
+            if rec.date_start and rec.date_end and rec.date_start > rec.date_end:
+                raise ValidationError(
+                    self.env._("Contract end date must be after the start date.")
+                )
+
+    @api.depends(
+        "contract_line_ids.last_date_invoiced",
+        "contract_line_ids.is_canceled",
+    )
+    def _compute_last_date_invoiced(self):
+        for contract in self:
+            dates = contract.contract_line_ids.filtered(
+                lambda line: (
+                    line.last_date_invoiced
+                    and not line.is_canceled
+                    and (not line.display_type or line.is_recurring_note)
+                )
+            ).mapped("last_date_invoiced")
+            contract.last_date_invoiced = max(dates) if dates else False
+
     def _inverse_partner_id(self):
         for rec in self:
             if not rec.invoice_partner_id:
@@ -655,6 +701,7 @@ def _recurring_create_invoice(self, date_ref=False):
         self._add_contract_origin(moves)
         self._invoice_followers(moves)
         self._compute_recurring_next_date()
+        self._compute_last_date_invoiced()
         return moves
 
     @api.model
diff --git a/contract/models/contract_recurring_mixin.py b/contract/models/contract_recurring_mixin.py
index 88b1659fb3..34dedfd1b0 100644
--- a/contract/models/contract_recurring_mixin.py
+++ b/contract/models/contract_recurring_mixin.py
@@ -70,6 +70,7 @@ class ContractRecurringMixin(models.AbstractModel):
     # Define when and how invoices should be issued within the recurrence.
 
     last_date_invoiced = fields.Date(
+        string="Date of Last Invoice",
         readonly=True,
         copy=False,
     )
diff --git a/contract/models/contract_tag.py b/contract/models/contract_tag.py
index 9cd98aeaa7..60673d5bb6 100644
--- a/contract/models/contract_tag.py
+++ b/contract/models/contract_tag.py
@@ -1,6 +1,8 @@
 # Copyright 2019 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from random import randint
+
 from odoo import fields, models
 
 
@@ -8,8 +10,13 @@ class ContractTag(models.Model):
     _name = "contract.tag"
     _description = "Contract Tag"
 
+    def _get_default_color(self):
+        return randint(1, 11)
+
     name = fields.Char(required=True)
     company_id = fields.Many2one(
         "res.company", string="Company", default=lambda self: self.env.company
     )
-    color = fields.Integer("Color Index", default=0)
+    color = fields.Integer(
+        string="Color Index", default=lambda self: self._get_default_color()
+    )
diff --git a/contract/models/contract_template.py b/contract/models/contract_template.py
index b886071e26..dcc7878f50 100644
--- a/contract/models/contract_template.py
+++ b/contract/models/contract_template.py
@@ -20,6 +20,7 @@ class ContractTemplate(models.Model):
 
     # === Basic Info ===
 
+    active = fields.Boolean(default=True)
     name = fields.Char(required=True)
     partner_id = fields.Many2one(
         comodel_name="res.partner",
diff --git a/contract/static/description/icon.png b/contract/static/description/icon.png
index 3a0328b516..41af807e5b 100644
Binary files a/contract/static/description/icon.png and b/contract/static/description/icon.png differ
diff --git a/contract/static/description/icon.svg b/contract/static/description/icon.svg
new file mode 100644
index 0000000000..93bbb22aee
--- /dev/null
+++ b/contract/static/description/icon.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg:svg
+   width="50"
+   height="50"
+   viewBox="0 0 50 50"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="contract icon.svg"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <svg:defs
+     id="defs5" />
+  <sodipodi:namedview
+     id="namedview5"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="17.041273"
+     inkscape:cx="31.100962"
+     inkscape:cy="27.316034"
+     inkscape:window-width="2816"
+     inkscape:window-height="1416"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
+  <svg:path
+     d="m 21.916903,10.037945 a 4.9036888,4.8200678 0 0 1 6.406805,-2.6080283 l 13.591336,5.5330883 a 4.9036888,4.8200678 0 0 1 2.653275,6.297552 L 34.247325,43.752101 a 4.9036888,4.8200678 0 0 1 -6.405588,2.609225 L 14.250401,40.827041 A 4.9036888,4.8200678 0 0 1 11.597127,34.529489 L 21.91812,10.037945 Z"
+     fill="#fc868b"
+     id="path2"
+     style="stroke-width:1.20668" />
+  <svg:path
+     d="M 4,8.8200678 A 4.9036888,4.8200678 0 0 1 8.9036888,4 H 23.614755 a 4.9036888,4.8200678 0 0 1 4.903689,4.8200678 V 35.331039 a 4.9036888,4.8200678 0 0 1 -4.904906,4.818872 H 8.9049059 A 4.9036888,4.8200678 0 0 1 4,35.329843 V 8.8212642 Z"
+     fill="#2EBCFA"
+     id="path4"
+     style="fill:#fbb945;fill-opacity:1;stroke-width:1.20668" />
+  <svg:path
+     d="m 28.309103,7.4227387 c 0.136315,0.442647 0.209341,0.9116137 0.209341,1.3973291 V 35.331039 a 4.9036888,4.8200678 0 0 1 -4.903689,4.820068 H 13.077119 A 4.9049059,4.8212642 0 0 1 11.59591,34.529489 L 21.916903,10.037945 a 4.9036888,4.8200678 0 0 1 6.3922,-2.6152063 z"
+     fill="#2d6388"
+     id="path5"
+     style="stroke-width:1.20668;fill:#f78613;fill-opacity:1;opacity:0.47585011" />
+  <script />
+  <svg:path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 12.312208,26.757918 c -0.794257,0.762841 -1.502683,1.723488 -1.907924,2.374503 L 8.8542034,28.700284 c 0.4342787,-0.697656 1.1956546,-1.735571 2.0804396,-2.584952 0.43983,-0.422583 0.938589,-0.82578 1.472363,-1.115182 0.514987,-0.279006 1.207611,-0.529072 1.98436,-0.438319 1.539833,0.179824 2.261922,1.073037 2.60183,1.83335 0.350157,0.784758 0.402252,1.647626 0.402252,2.153377 v 0.0048 c 0,0.277039 0,0.678831 -0.02903,1.147213 0.527795,-0.01939 0.985133,0.02389 1.381407,0.114075 a 2.5578471,1.6830286 0 0 1 0.299768,-0.313847 c 0.43129,-0.354026 1.075235,-0.569251 1.900663,-0.579367 0.737036,-0.009 1.233234,0.281535 1.556914,0.471192 0.02819,0.01686 0.05551,0.03259 0.08114,0.0472 0.35101,0.201739 0.777175,0.437755 1.549227,0.650171 0.02221,-0.0017 0.05551,-0.0048 0.102482,-0.01096 0.149458,-0.01966 0.34674,-0.059 0.578612,-0.114075 0.308309,-0.07334 0.590142,-0.151725 0.851904,-0.224497 0.156289,-0.04327 0.305319,-0.08485 0.448797,-0.121943 l 0.607649,1.04803 c -0.07771,0.01995 -0.192158,0.05141 -0.327098,0.08879 a 22.661927,14.91124 0 0 1 -1.018867,0.26861 c -0.262191,0.06238 -0.547866,0.122504 -0.815607,0.157906 -0.220343,0.02894 -0.609784,0.06884 -0.969762,-0.02669 -1.069258,-0.283218 -1.675625,-0.618138 -2.100937,-0.862585 -0.437267,-0.250909 -0.472283,-0.249223 -0.506018,-0.247537 h -0.0072 c -0.370653,0.0048 -0.534628,0.08794 -0.629853,0.165774 -0.08156,0.06744 -0.148176,0.162964 -0.190452,0.281816 0.09309,0.07895 0.176787,0.160998 0.247672,0.243884 0.127679,0.148916 0.248526,0.339978 0.269876,0.55127 0.02348,0.22815 -0.07259,0.500694 -0.41976,0.703275 a 0.92236221,0.60690177 0 0 1 -0.784008,0.146668 0.99068537,0.65185746 0 0 1 -0.546585,-0.204829 c -0.180243,-0.129261 -0.279739,-0.292225 -0.336532,-0.40911 a 3.5741535,2.3517444 0 0 1 -0.153723,-0.576567 c -0.196856,-0.07558 -0.559396,-0.162964 -1.195655,-0.112389 l -0.0072,0.0458 c -0.161413,0.942383 -0.491927,2.015139 -1.207611,2.851314 -0.650778,0.760314 -1.320345,1.385197 -1.962583,1.828292 -0.320692,0.221687 -0.652058,0.409939 -0.98855,0.545931 -0.330086,0.133462 -0.717819,0.237984 -1.135872,0.237984 -0.581174,0 -1.347246,-0.130652 -1.793481,-0.622918 -0.4232399,-0.46698 -0.3984729,-1.092989 -0.05728,-1.823237 0.68067,-1.458812 2.284983,-3.047153 4.881261,-3.782741 a 9.9969547,6.5778599 0 0 1 0.698178,-0.178418 c 0.04825,-0.560541 0.04868,-1.053649 0.04868,-1.388288 0,-0.475125 -0.05294,-1.206217 -0.332222,-1.831381 -0.290372,-0.649611 -0.72209,-0.982844 -1.281485,-1.04803 -0.06277,-0.0073 -0.26219,0 -0.639248,0.204548 -0.358271,0.194152 -0.751555,0.500694 -1.151246,0.884223 z m 3.164215,4.435721 c -1.938669,0.591449 -3.22229,1.831664 -3.786383,3.039848 -0.288665,0.61814 -0.158851,0.850505 -0.109746,0.904732 0.02604,0.02894 0.09949,0.08205 0.357842,0.08205 0,0 0.02092,-2.81e-4 0.06662,-0.01068 0.04782,-0.01068 0.114866,-0.03063 0.201126,-0.06546 0.175078,-0.0708 0.394994,-0.189095 0.651205,-0.366108 0.512423,-0.354026 1.102565,-0.893494 1.711068,-1.604637 0.453921,-0.530477 0.737462,-1.238248 0.90827,-1.979736 z"
+     fill="#005E7A"
+     id="path2-3"
+     style="fill:#2ebcfa;fill-opacity:1;stroke-width:0.346383" />
+  <svg:path
+     d="m 6.4107884,12.062241 c 0,-1.43054 0.8049096,-2.589212 1.7982411,-2.589212 H 25.294149 c 0,1.43054 -0.80491,2.589212 -1.798241,2.589212 z"
+     fill="#2EBCFA"
+     id="path1"
+     style="fill:#005e7a;fill-opacity:1;stroke-width:0.54409" />
+  <svg:path
+     d="m 6.5518669,17.236515 c 0,-0.65108 0.610355,-1.178424 1.363587,-1.178424 H 20.870913 c 0,0.65108 -0.610354,1.178424 -1.363586,1.178424 z"
+     fill="#2EBCFA"
+     id="path1-5"
+     style="opacity:0.867389;fill:#005e7a;fill-opacity:1;stroke-width:0.319635" />
+  <svg:path
+     d="m 6.4605809,19.302905 c 0,-0.65108 0.610355,-1.178424 1.363587,-1.178424 H 20.779627 c 0,0.65108 -0.610354,1.178424 -1.363586,1.178424 z"
+     fill="#2EBCFA"
+     id="path1-5-5"
+     style="opacity:0.867389;fill:#005e7a;fill-opacity:1;stroke-width:0.319635" />
+  <svg:metadata
+     id="metadata6">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>bosd</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+</svg:svg>
diff --git a/contract/static/src/img/contract_icon.svg b/contract/static/src/img/contract_icon.svg
deleted file mode 100644
index 75de01bcd0..0000000000
--- a/contract/static/src/img/contract_icon.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="64" xmlns="http://www.w3.org/2000/svg" height="64" viewBox="0 0 64 64" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <image x="0" y="0" width="64" height="64" xlink:href="data:image/png;base64,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"/>
-</svg>
diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py
index c42de5ad82..7e0b478b2f 100644
--- a/contract/tests/test_contract.py
+++ b/contract/tests/test_contract.py
@@ -533,6 +533,33 @@ def test_last_invoice_pre_paid(self):
             "Should not create a new invoice after the last one",
         )
 
+    def test_contract_last_date_invoiced(self):
+        """contract.contract.last_date_invoiced aggregates max of line values,
+        excluding cancelled lines and pure section/note rows."""
+        self.assertFalse(self.acct_line.last_date_invoiced)
+        self.assertFalse(self.contract.last_date_invoiced)
+        self.acct_line.date_start = "2018-01-01"
+        self.acct_line.recurring_invoicing_type = "post-paid"
+        self.acct_line.date_end = "2018-03-15"
+        self.contract.recurring_create_invoice()
+        self.assertEqual(self.acct_line.last_date_invoiced, to_date("2018-01-31"))
+        self.assertEqual(self.contract.last_date_invoiced, to_date("2018-01-31"))
+        line2 = self.env["contract.line"].create(
+            dict(self.line_vals, recurring_next_date="2018-04-15")
+        )
+        line2.last_date_invoiced = "2018-03-31"
+        self.assertEqual(self.contract.last_date_invoiced, to_date("2018-03-31"))
+        line2.is_canceled = True
+        self.assertEqual(self.contract.last_date_invoiced, to_date("2018-01-31"))
+        self.env["contract.line"].create(
+            {
+                "contract_id": self.contract.id,
+                "display_type": "line_section",
+                "name": "Header",
+            }
+        )
+        self.assertEqual(self.contract.last_date_invoiced, to_date("2018-01-31"))
+
     def test_onchange_partner_id(self):
         self.contract._onchange_partner_id()
         self.assertEqual(
@@ -569,6 +596,15 @@ def test_check_recurring_next_date_start_date(self):
                 {"date_start": "2018-01-01", "recurring_next_date": "2017-01-01"}
             )
 
+    def test_check_contract_start_end_dates(self):
+        """Setting date_end earlier than date_start on the contract record
+        itself must raise a validation error."""
+        contract = self.env["contract.contract"].create(
+            {"name": "Date check", "partner_id": self.partner.id}
+        )
+        with self.assertRaises(ValidationError):
+            contract.write({"date_start": "2025-01-01", "date_end": "2024-12-31"})
+
     def test_onchange_contract_template_id(self):
         """It should change the contract values to match the template."""
         self.contract.contract_template_id = False
diff --git a/contract/views/contract.xml b/contract/views/contract.xml
index 50dab8bac4..1d8b4da140 100644
--- a/contract/views/contract.xml
+++ b/contract/views/contract.xml
@@ -28,7 +28,7 @@
                         <button
                             name="action_show_invoices"
                             type="object"
-                            icon="fa-list"
+                            icon="fa-pencil-square-o"
                             class="oe_stat_button"
                             invisible="generation_type != 'invoice'"
                         >
@@ -47,18 +47,23 @@
                     />
                     <div class="oe_title">
                         <label for="name" string="Contract Name" class="oe_edit_only" />
-                        <h3>
+                        <h1>
                             <field
                                 name="name"
                                 class="oe_inline"
                                 placeholder="e.g. Contract XYZ"
                             />
-                        </h3>
+                        </h1>
                     </div>
                     <group name="main">
                         <group>
-                            <field name="partner_id" required="1" />
-                            <field name="user_id" />
+                            <field
+                                name="partner_id"
+                                required="1"
+                                widget="res_partner_many2one"
+                                context="{'show_address': 1}"
+                                options='{"always_reload": True}'
+                            />
                         </group>
                         <group>
                             <field
@@ -67,12 +72,6 @@
                                 context="{'default_contract_type': contract_type}"
                             />
                             <field name="pricelist_id" />
-
-                            <field
-                                name="company_id"
-                                options="{'no_create': True}"
-                                groups="base.group_multi_company"
-                            />
                             <field name="contract_type" invisible="1" required="1" />
                             <field
                                 name="tag_ids"
@@ -315,12 +314,28 @@
                         </page>
                         <page name="info" string="Other Information">
                             <group>
-                                <field name="code" />
-                                <field name="group_id" />
-                                <field
-                                    name="currency_id"
-                                    groups="base.group_multi_currency"
-                                />
+                                <group string="Sales" name="group_sales">
+                                    <field
+                                        name="user_id"
+                                        widget="many2one_avatar_user"
+                                    />
+                                    <field
+                                        name="company_id"
+                                        options="{'no_create': True}"
+                                        groups="base.group_multi_company"
+                                    />
+                                </group>
+                                <group
+                                    string="Administration"
+                                    name="group_administration"
+                                >
+                                    <field name="code" />
+                                    <field name="group_id" />
+                                    <field
+                                        name="currency_id"
+                                        groups="base.group_multi_currency"
+                                    />
+                                </group>
                             </group>
 
                             <group
@@ -370,7 +385,8 @@
                 <attribute
                     name="context"
                 >{'default_customer_rank': 1, 'default_supplier_rank': 0,
-                    'res_partner_search_mode': 'customer', 'show_vat': True}
+                    'res_partner_search_mode': 'customer', 'show_vat': True,
+                    'show_address': 1}
                 </attribute>
             </field>
             <field name="journal_id" position="attributes">
@@ -392,7 +408,8 @@
                 <attribute
                     name="context"
                 >{'default_customer_rank': False, 'default_supplier_rank': 1,
-                    'res_partner_search_mode': 'supplier', 'show_vat': True}
+                    'res_partner_search_mode': 'supplier', 'show_vat': True,
+                    'show_address': 1}
                 </attribute>
             </field>
             <field name="journal_id" position="attributes">
@@ -401,21 +418,78 @@
             </field>
         </field>
     </record>
+    <!--KANBAN view-->
+    <record id="contract_contract_kanban_view" model="ir.ui.view">
+        <field name="name">contract.contract kanban view (in contract)</field>
+        <field name="model">contract.contract</field>
+        <field name="arch" type="xml">
+            <kanban sample="1" highlight_color="color">
+                <templates>
+                    <t t-name="menu">
+                        <field name="color" widget="kanban_color_picker" />
+                        <a role="menuitem" type="open">Open</a>
+                        <a role="menuitem" type="object" name="copy">Duplicate</a>
+                        <a role="menuitem" type="archive">Archive</a>
+                        <a role="menuitem" type="unarchive">Restore</a>
+                        <a role="menuitem" type="delete">Delete</a>
+                    </t>
+                    <t t-name="card">
+                        <div class="d-flex align-items-baseline">
+                            <field name="partner_id" class="fw-bold fs-5" />
+                            <field
+                                name="tag_ids"
+                                widget="many2many_tags"
+                                options="{'color_field': 'color'}"
+                                class="ms-auto"
+                            />
+                        </div>
+                        <field name="name" />
+                        <div class="d-flex justify-content-between text-muted mt-2">
+                            <field name="code" />
+                            <field name="recurring_next_date" widget="remaining_days" />
+                        </div>
+                        <footer>
+                            <field name="activity_ids" widget="kanban_activity" />
+                            <field
+                                name="user_id"
+                                widget="many2one_avatar_user"
+                                class="ms-auto"
+                            />
+                        </footer>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
     <!--TREE view-->
     <record id="contract_contract_tree_view" model="ir.ui.view">
         <field name="name">contract.contract list view (in contract)</field>
         <field name="model">contract.contract</field>
         <field name="arch" type="xml">
-            <list>
+            <list
+                decoration-muted="date_end and date_end &lt; current_date"
+                decoration-info="date_start and date_start &gt; current_date"
+            >
                 <field name="name" string="Name" />
                 <field name="code" />
-                <field name="journal_id" groups="account.group_account_user" />
+                <field
+                    name="journal_id"
+                    groups="account.group_account_user"
+                    optional="hide"
+                />
                 <field name="partner_id" />
+                <field name="user_id" widget="many2one_avatar_user" optional="show" />
+                <field name="contract_template_id" optional="hide" />
                 <field
                     name="tag_ids"
                     widget="many2many_tags"
                     options="{'color_field': 'color'}"
                 />
+                <field name="date_start" optional="hide" />
+                <field name="date_end" widget="remaining_days" optional="show" />
+                <field name="recurring_next_date" optional="show" />
+                <field name="last_date_invoiced" optional="hide" />
+                <field name="activity_ids" widget="list_activity" optional="show" />
                 <field name="company_id" groups="base.group_multi_company" />
             </list>
         </field>
@@ -430,22 +504,34 @@
                     name="name"
                     filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]"
                 />
+                <field name="partner_id" />
+                <field name="commercial_partner_id" />
+                <field name="user_id" />
                 <field name="journal_id" />
                 <field name="pricelist_id" />
                 <separator />
+                <filter
+                    name="my_contracts"
+                    string="My Contracts"
+                    domain="[('user_id', '=', uid)]"
+                />
                 <separator />
+                <filter
+                    name="upcoming"
+                    string="Upcoming"
+                    domain="[('date_start', '&gt;', context_today().strftime('%Y-%m-%d'))]"
+                />
                 <filter
                     name="not_finished"
                     string="In progress"
-                    domain="['|', ('date_end', '&gt;=', context_today().strftime('%Y-%m-%d')), '&amp;', ('date_end', '=', False), ('recurring_next_date', '!=', False)]"
+                    domain="['&amp;', '|', ('date_start', '=', False), ('date_start', '&lt;=', context_today().strftime('%Y-%m-%d')), '|', ('date_end', '&gt;=', context_today().strftime('%Y-%m-%d')), '&amp;', ('date_end', '=', False), ('recurring_next_date', '!=', False)]"
                 />
                 <filter
                     name="finished"
                     string="Finished"
                     domain="[('date_end', '&lt;', context_today().strftime('%Y-%m-%d')), ('recurring_next_date', '=', False)]"
                 />
-                <field name="partner_id" />
-                <field name="commercial_partner_id" />
+                <separator />
                 <filter
                     string="Archived"
                     domain="[('active', '=', False)]"
@@ -453,22 +539,38 @@
                 />
                 <group>
                     <filter
-                        string="Associated Partner"
+                        string="Contact"
                         name="group_by_partner"
                         domain="[]"
                         context="{'group_by':'partner_id'}"
                     />
                     <filter
                         name="commercial_partner_groupby"
-                        string="Commercial Entity"
+                        string="Company"
                         context="{'group_by': 'commercial_partner_id'}"
                     />
+                    <filter
+                        name="group_by_user"
+                        string="Responsible"
+                        context="{'group_by': 'user_id'}"
+                    />
+                    <filter
+                        name="group_by_journal"
+                        string="Journal"
+                        context="{'group_by': 'journal_id'}"
+                    />
                     <filter
                         name="group_by_next_invoice"
                         string="Next Invoice"
                         domain="[('recurring_next_date', '!=', False)]"
                         context="{'group_by':'recurring_next_date'}"
                     />
+                    <filter
+                        name="group_by_last_invoice"
+                        string="Last Invoice"
+                        domain="[('last_date_invoiced', '!=', False)]"
+                        context="{'group_by':'last_date_invoiced'}"
+                    />
                     <filter
                         name="group_by_date_end"
                         string="Date End"
@@ -483,7 +585,7 @@
     <record id="action_customer_contract" model="ir.actions.act_window">
         <field name="name">Customer Contracts</field>
         <field name="res_model">contract.contract</field>
-        <field name="view_mode">list,form</field>
+        <field name="view_mode">list,kanban,activity,form</field>
         <field name="path">customer-contracts</field>
         <field name="domain">[('contract_type', '=', 'sale')]</field>
         <field name="context">
@@ -520,7 +622,7 @@
     <record id="action_supplier_contract" model="ir.actions.act_window">
         <field name="name">Supplier Contracts</field>
         <field name="res_model">contract.contract</field>
-        <field name="view_mode">list,form</field>
+        <field name="view_mode">list,kanban,activity,form</field>
         <field name="path">supplier-contracts</field>
         <field name="domain">[('contract_type', '=', 'purchase')]</field>
         <field name="context">
diff --git a/contract/views/contract_portal_templates.xml b/contract/views/contract_portal_templates.xml
index 910d3eb161..5f17d1dc87 100644
--- a/contract/views/contract_portal_templates.xml
+++ b/contract/views/contract_portal_templates.xml
@@ -34,10 +34,7 @@
     >
         <div id="portal_common_category" position="inside">
             <t t-call="portal.portal_docs_entry">
-                <t
-                    t-set="icon"
-                    t-value="'/contract/static/src/img/contract_icon.svg'"
-                />
+                <t t-set="icon" t-value="'/contract/static/description/icon.svg'" />
                 <t t-set="title">Contracts</t>
                 <t t-set="url" t-value="'/my/contracts'" />
                 <t t-set="placeholder_count" t-value="'contract_count'" />
diff --git a/contract/views/contract_tag.xml b/contract/views/contract_tag.xml
index dffab7a6c1..e8d85cd3cd 100644
--- a/contract/views/contract_tag.xml
+++ b/contract/views/contract_tag.xml
@@ -2,27 +2,12 @@
 <!-- Copyright 2020 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <record id="contract_tag_form_view" model="ir.ui.view">
-        <field name="model">contract.tag</field>
-        <field name="arch" type="xml">
-            <form>
-                <group>
-                    <field name="name" />
-                    <field name="color" />
-                    <field
-                        name="company_id"
-                        options="{'no_create': True}"
-                        groups="base.group_multi_company"
-                    />
-                </group>
-            </form>
-        </field>
-    </record>
     <record model="ir.ui.view" id="contract_tag_tree_view">
         <field name="model">contract.tag</field>
         <field name="arch" type="xml">
-            <list>
+            <list editable="bottom">
                 <field name="name" />
+                <field name="color" widget="color_picker" />
                 <field
                     name="company_id"
                     options="{'no_create': True}"
@@ -34,7 +19,7 @@
     <record model="ir.actions.act_window" id="contract_tag_act_window">
         <field name="name">Contract Tags</field>
         <field name="res_model">contract.tag</field>
-        <field name="view_mode">list,form</field>
+        <field name="view_mode">list</field>
         <field name="path">contract-tags</field>
     </record>
     <record model="ir.ui.menu" id="contract_tag_menu">
diff --git a/contract/views/contract_template.xml b/contract/views/contract_template.xml
index 82e8e97e84..2de6888132 100644
--- a/contract/views/contract_template.xml
+++ b/contract/views/contract_template.xml
@@ -7,15 +7,21 @@
         <field name="arch" type="xml">
             <form string="Contract Template">
                 <sheet>
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        invisible="active"
+                    />
                     <div class="oe_title">
                         <label for="name" string="Contract Name" class="oe_edit_only" />
-                        <h3>
+                        <h1>
                             <field
                                 name="name"
                                 class="oe_inline"
                                 placeholder="e.g. Contract XYZ"
                             />
-                        </h3>
+                        </h1>
                     </div>
                     <group name="group_main">
                         <group name="group_main_left">
@@ -137,6 +143,12 @@
                 <field name="contract_type" />
                 <field name="pricelist_id" />
                 <field name="journal_id" />
+                <separator />
+                <filter
+                    string="Archived"
+                    domain="[('active', '=', False)]"
+                    name="inactive"
+                />
                 <filter
                     name="contract_type"
                     string="Contract Type"