diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1357b0aa..698aede1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.13.0] - 2026-08-23
+
+### Added
+
+- **Dashboard daily progress widget** — Compact strip showing today's tracked hours vs target with a quick-start timer button directly on the dashboard.
+- **Dashboard quick-log & tasks due today** — One-click time log form and a "Tasks due today" widget surface the most time-sensitive work without leaving the home screen.
+- **Backend dashboard alerts & productivity breakdown** — Server-side alert rules for overdue timers, approaching daily targets, and idle sessions; new productivity breakdown API for the dashboard.
+- **Timer long-run warning** — Active timers exceeding a configurable threshold display an in-page warning and show workday progress against the daily goal.
+
+### Changed
+
+- **Dashboard & list UX polish** — Consolidated dashboard alert banners, list-view sort/filter controls, and empty-state illustrations unified across all entity lists.
+- **Navigation declutter** — Sidebar collapsed-mode tooltips and mobile "More" drawer reorganised; key destinations (Reports, CRM, Finance) promoted to top-level slots.
+- **Recurring tasks list** — Added status filter chips, column-level toggles (pause/resume/run now), and an inline "Run now" action without leaving the list.
+- **Floating timer bar & idle-stop** — Redesigned compact bar with project/task labels, elapsed counter, and a smoother idle-boundary stop flow.
+- **Client versions** — Synced Electron (`desktop/package.json`), Flutter (`mobile/pubspec.yaml`), and Chromium extension (`browser-extension/manifest.json` / `package.json`) to **5.13.0** with the webapp (`setup.py`).
+
+### Fixed
+
+- **Productivity heatmap** — Corrected heatmap data aggregation and resolved `empty_state` template render error.
+- **Invoice tax rate & currency** — Tax rate and currency now resolve correctly from the linked project and client settings when generating an invoice.
+- **Swallowed errors (#736)** — Previously silent exceptions now log at the appropriate level; actionable failures surface feedback toasts to the user.
+- **Timer heartbeats (#736)** — Heartbeat pings stay alive through network interruptions and the timer stops cleanly at the idle boundary.
+- **Client portal admin template** — Added the missing customisation admin template that caused a 500 on the portal settings page.
+- **Recurring tasks CRUD** — Completed create/edit/delete flow and restored sidebar navigation link for recurring tasks.
+
+### Documentation
+
+- **Version** — Bumped `setup.py` to **5.13.0** (single source of truth for the application version).
+
 ## [5.12.0] - 2026-08-20
 
 ### Added
diff --git a/README.md b/README.md
index 437ac153..ecf9bea1 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,10 @@ TimeTracker has been continuously enhanced with powerful new features! Here's wh
 
 **Current version** is defined in `setup.py` (single source of truth). See [CHANGELOG.md](CHANGELOG.md) for versioned release history.
 
+### ✨ Highlights of v5.13.0
+
+**Minor (5.13.0):** **Daily progress widget** — compact strip on the dashboard with today's hours vs target and a quick-start timer. **Quick-log & tasks due today** — one-click log form and due-today task widget without leaving home. **Timer long-run warning** — alert when a timer exceeds the configurable threshold, with workday progress. **Navigation declutter** — sidebar and mobile More drawer reorganised with key destinations promoted. **Recurring tasks list** — status filters, pause/resume/run-now inline actions. **Floating timer bar & idle-stop** — redesigned compact bar and smoother idle boundary. **Fixes** — productivity heatmap, invoice tax rate/currency resolution, swallowed errors (#736), timer heartbeats (#736), portal admin template, recurring tasks CRUD. See [CHANGELOG.md](CHANGELOG.md#5130---2026-08-23).
+
 ### ✨ Highlights of v5.12.0
 
 **Minor (5.12.0):** **Task dependencies & Gantt links** — blockers between tasks with arrows on the chart. **Milestones** — named due-date checkpoints and project timeline. **Utilization report** — billable vs total hours by user or project. **Expense approvals** — manager queue with bulk-approve and pending badge. **Quote signatures** — in-portal sign/accept with PDF embed. **Resource scheduling** — weekly capacity swimlanes. **Project health** — budget burn, completion, milestones, and overdue work in one view. **Fixes** — dashboard Start Timer modal (#734), PostgreSQL approval status enum case. See [CHANGELOG.md](CHANGELOG.md#5120---2026-08-20).
diff --git a/app/routes/api.py b/app/routes/api.py
index 5fa1d25c..824c5eeb 100644
--- a/app/routes/api.py
+++ b/app/routes/api.py
@@ -342,6 +342,40 @@ def timer_status():
     )
 
 
+@api_bp.route("/api/timer/notes-suggestions")
+@login_required
+def timer_notes_suggestions():
+    """Recent time-entry notes for description autocomplete, optionally scoped to a project."""
+    project_id = request.args.get("project_id", type=int)
+    q = (
+        db.session.query(TimeEntry.notes)
+        .filter(
+            TimeEntry.user_id == current_user.id,
+            TimeEntry.notes.isnot(None),
+            TimeEntry.notes != "",
+        )
+    )
+    if project_id:
+        q = q.filter(TimeEntry.project_id == project_id)
+    rows = q.order_by(TimeEntry.updated_at.desc()).limit(150).all()
+
+    seen = set()
+    suggestions = []
+    for (notes,) in rows:
+        text = (notes or "").strip()
+        if not text:
+            continue
+        key = text.lower()
+        if key in seen:
+            continue
+        seen.add(key)
+        suggestions.append(text[:200])
+        if len(suggestions) >= 20:
+            break
+
+    return jsonify({"ok": True, "suggestions": suggestions})
+
+
 @api_bp.route("/api/timer/heartbeat", methods=["POST"])
 @login_required
 @deprecated_session_api("/api/v1/timer/heartbeat")
@@ -2491,6 +2525,7 @@ def productivity_stats():
 
         summary = ProductivityService.get_summary(current_user)
         daily_breakdown = ProductivityService.get_daily_breakdown(current_user, days=14)
+        daily_project_breakdown = ProductivityService.get_daily_project_breakdown(current_user, days=14)
         streak = ProductivityService.get_streak(current_user)
         focus = ProductivityService.get_focus_stats(current_user, days=period)
         projects = ProductivityService.get_project_breakdown(current_user, days=period)
@@ -2502,6 +2537,7 @@ def productivity_stats():
             "period": period,
             "summary": summary,
             "daily_breakdown": daily_breakdown,
+            "daily_project_breakdown": daily_project_breakdown,
             "streak": streak,
             "focus": focus,
             "projects": projects,
diff --git a/app/routes/api_v1_mileage.py b/app/routes/api_v1_mileage.py
index 7be5eac4..9d616089 100644
--- a/app/routes/api_v1_mileage.py
+++ b/app/routes/api_v1_mileage.py
@@ -153,12 +153,21 @@ def update_mileage(entry_id):
         parsed = _parse_date(data["trip_date"])
         if parsed:
             entry.trip_date = parsed
+    invalid_numeric_fields = []
     for numfield in ("distance_km", "rate_per_km", "start_odometer", "end_odometer"):
         if numfield in data:
             try:
                 setattr(entry, numfield, Decimal(str(data[numfield])))
             except Exception:
-                pass
+                invalid_numeric_fields.append(numfield)
+    if invalid_numeric_fields:
+        return jsonify(
+            {
+                "error": "Invalid numeric value",
+                "fields": invalid_numeric_fields,
+                "message": f"Invalid value for: {', '.join(invalid_numeric_fields)}",
+            }
+        ), 400
     if "is_round_trip" in data:
         entry.is_round_trip = bool(data["is_round_trip"])
     if "distance_km" in data or "rate_per_km" in data:
diff --git a/app/routes/expenses.py b/app/routes/expenses.py
index a0595763..577cb295 100644
--- a/app/routes/expenses.py
+++ b/app/routes/expenses.py
@@ -953,8 +953,13 @@ def approve_expense(expense_id):
                 from app.utils.integration_sync_hooks import trigger_expense_sync
 
                 trigger_expense_sync(expense)
-            except Exception:
-                pass
+            except Exception as sync_error:
+                current_app.logger.warning(
+                    "Expense approved but integration sync failed for expense %s: %s",
+                    expense_id,
+                    sync_error,
+                    exc_info=True,
+                )
         else:
             flash(_("Error approving expense"), "error")
 
diff --git a/app/routes/main.py b/app/routes/main.py
index 50a596d6..7d5d9003 100644
--- a/app/routes/main.py
+++ b/app/routes/main.py
@@ -16,10 +16,11 @@
 )
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
-from sqlalchemy import text
+from sqlalchemy import or_, text
+from sqlalchemy.orm import joinedload
 
 from app import csrf, db, limiter, track_event, track_page_view
-from app.models import Activity, Client, Project, Settings, TimeEntry, TimeEntryTemplate, User, WeeklyTimeGoal
+from app.models import Activity, Client, Invoice, Milestone, Project, Settings, Task, TimeEntry, TimeEntryTemplate, User, WeeklyTimeGoal
 from app.models.time_entry import local_now
 from app.utils.license_utils import is_license_activated
 from app.utils.posthog_segmentation import update_user_segments_if_needed
@@ -219,6 +220,153 @@ def dashboard():
             "client_name": last_entry.client.name if last_entry.client else None,
         }
 
+    # Recent project+task combos for quick-start strip (last 5 unique pairs)
+    recent_combos = []
+    combo_seen = set()
+    combo_entries = (
+        TimeEntry.query.options(joinedload(TimeEntry.project), joinedload(TimeEntry.task))
+        .filter(
+            TimeEntry.user_id == current_user.id,
+            TimeEntry.end_time.isnot(None),
+            TimeEntry.project_id.isnot(None),
+        )
+        .order_by(TimeEntry.end_time.desc())
+        .limit(50)
+        .all()
+    )
+    for combo_entry in combo_entries:
+        combo_key = (combo_entry.project_id, combo_entry.task_id)
+        if combo_key in combo_seen:
+            continue
+        combo_seen.add(combo_key)
+        recent_combos.append(
+            {
+                "project_id": combo_entry.project_id,
+                "task_id": combo_entry.task_id,
+                "project_name": combo_entry.project.name if combo_entry.project else None,
+                "task_name": combo_entry.task.name if combo_entry.task else None,
+            }
+        )
+        if len(recent_combos) >= 5:
+            break
+
+    today_seconds = int(round(today_hours * 3600))
+    daily_target_seconds = int(round(standard_hours_per_day * 3600))
+
+    from app.services.utilization_service import UtilizationService
+
+    week_utilization = UtilizationService.for_user_period(
+        current_user.id,
+        datetime.combine(week_start_dt, datetime.min.time()),
+        datetime.combine(today_dt, datetime.max.time()),
+    )
+    is_past_midday = local_now().hour >= 12
+
+    # Tasks due today or overdue (assigned to or created by current user)
+    today_date = local_now().date()
+    tasks_due_query = (
+        Task.query.options(joinedload(Task.project))
+        .filter(
+            Task.due_date.isnot(None),
+            Task.due_date <= today_date,
+            Task.status.notin_(["done", "cancelled"]),
+        )
+        .order_by(Task.due_date.asc(), Task.priority.desc())
+    )
+    if not current_user.is_admin:
+        tasks_due_query = tasks_due_query.filter(
+            or_(Task.assigned_to == current_user.id, Task.created_by == current_user.id)
+        )
+    tasks_due_today = tasks_due_query.limit(5).all()
+
+    # Tasks and milestones due in the next 7 days (excluding today/overdue)
+    upcoming_deadline_end = today_date + timedelta(days=7)
+    upcoming_tasks_query = (
+        Task.query.options(joinedload(Task.project))
+        .filter(
+            Task.due_date.isnot(None),
+            Task.due_date > today_date,
+            Task.due_date <= upcoming_deadline_end,
+            Task.status.notin_(["done", "cancelled"]),
+        )
+        .order_by(Task.due_date.asc(), Task.priority.desc())
+    )
+    if not current_user.is_admin:
+        upcoming_tasks_query = upcoming_tasks_query.filter(
+            or_(Task.assigned_to == current_user.id, Task.created_by == current_user.id)
+        )
+    upcoming_tasks = upcoming_tasks_query.limit(8).all()
+
+    from app.utils.scope_filter import get_allowed_project_ids
+
+    scope_project_ids = get_allowed_project_ids(current_user)
+    upcoming_milestones_query = (
+        Milestone.query.options(joinedload(Milestone.project))
+        .filter(
+            Milestone.due_date.isnot(None),
+            Milestone.due_date > today_date,
+            Milestone.due_date <= upcoming_deadline_end,
+            Milestone.status != "completed",
+        )
+        .order_by(Milestone.due_date.asc())
+    )
+    if scope_project_ids is not None:
+        upcoming_milestones_query = upcoming_milestones_query.filter(Milestone.project_id.in_(scope_project_ids))
+    upcoming_milestones = upcoming_milestones_query.limit(8).all()
+
+    upcoming_deadlines = []
+    for task in upcoming_tasks:
+        upcoming_deadlines.append(
+            {
+                "kind": "task",
+                "name": task.name,
+                "due_date": task.due_date,
+                "project_name": task.project.name if task.project else None,
+                "url": url_for("tasks.view_task", task_id=task.id),
+            }
+        )
+    for milestone in upcoming_milestones:
+        upcoming_deadlines.append(
+            {
+                "kind": "milestone",
+                "name": milestone.name,
+                "due_date": milestone.due_date,
+                "project_name": milestone.project.name if milestone.project else None,
+                "url": url_for("projects.view_project", project_id=milestone.project_id),
+            }
+        )
+    upcoming_deadlines.sort(key=lambda item: item["due_date"])
+    upcoming_deadlines = upcoming_deadlines[:10]
+
+    # Overdue invoice summary for billing users
+    overdue_invoices_summary = None
+    from app.utils.module_helpers import is_module_enabled
+
+    if is_module_enabled("invoices") and (
+        current_user.is_admin or current_user.has_permission("create_invoices")
+    ):
+        overdue_rows = (
+            Invoice.query.filter(
+                Invoice.status.in_(["sent", "overdue", "partially_paid"]),
+                Invoice.due_date < today_date,
+            )
+            .order_by(Invoice.due_date.asc())
+            .all()
+        )
+        overdue_total = 0.0
+        overdue_count = 0
+        for inv in overdue_rows:
+            outstanding = float(inv.outstanding_amount or 0)
+            if outstanding > 0:
+                overdue_count += 1
+                overdue_total += outstanding
+        if overdue_count:
+            overdue_invoices_summary = {
+                "count": overdue_count,
+                "total": round(overdue_total, 2),
+                "url": url_for("invoices.list_invoices", status="overdue"),
+            }
+
     # Post-timer toast data (show "Logged Xh on Project" + link to time entries)
     timer_stopped_toast = session.pop("timer_stopped_toast", None)
     if timer_stopped_toast:
@@ -264,22 +412,44 @@ def dashboard():
         today_hours=float(today_hours or 0),
     )
     if support_dashboard_prompt:
-        SupportPromptService.mark_prompt_shown(session, support_dashboard_prompt["variant"])
         v = support_dashboard_prompt.get("variant")
+        if v == SupportPromptService.VARIANT_HOURS_MILESTONE:
+            SupportPromptService.mark_hours_milestone_shown(
+                session, int(support_dashboard_prompt.get("milestone") or 0)
+            )
+        else:
+            SupportPromptService.mark_prompt_shown(session, v)
         if v == SupportPromptService.VARIANT_SEVEN_DAY:
             support_dashboard_prompt = {
                 **support_dashboard_prompt,
                 "message": _(
-                    "You have been using TimeTracker for a week or more. If it fits your workflow, "
-                    "consider supporting continued development."
+                    "A week in — glad you're here. TimeTracker is built by one person, "
+                    "and every bit of support helps."
+                ),
+            }
+        elif v == SupportPromptService.VARIANT_ANNIVERSARY_30D:
+            support_dashboard_prompt = {
+                **support_dashboard_prompt,
+                "message": _(
+                    "You've been using TimeTracker for a month — thank you for being part of the community. "
+                    "If the app helps your work, consider supporting its development."
+                ),
+            }
+        elif v == SupportPromptService.VARIANT_HOURS_MILESTONE:
+            milestone = int(support_dashboard_prompt.get("milestone") or 0)
+            support_dashboard_prompt = {
+                **support_dashboard_prompt,
+                "message": _(
+                    "You've tracked %(hours)s hours with TimeTracker. That's reliable data for your clients "
+                    "and your business — consider supporting continued development.",
+                    hours=milestone,
                 ),
             }
         elif v == SupportPromptService.VARIANT_ACTIVE_TODAY:
             support_dashboard_prompt = {
                 **support_dashboard_prompt,
                 "message": _(
-                    "You have tracked a solid amount of time today. If TimeTracker makes your day easier, "
-                    "you can support the project in a click."
+                    "You've been tracking for a while today. TimeTracker is free because of supporters like you."
                 ),
             }
 
@@ -321,7 +491,16 @@ def dashboard():
         "templates": templates,
         "recent_activities": recent_activities,
         "last_timer_context": last_timer_context,
+        "recent_combos": recent_combos,
+        "today_seconds": today_seconds,
+        "daily_target_seconds": daily_target_seconds,
+        "week_utilization": week_utilization,
+        "is_past_midday": is_past_midday,
         "recent_tags": recent_tags,
+        "tasks_due_today": tasks_due_today,
+        "upcoming_deadlines": upcoming_deadlines,
+        "overdue_invoices_summary": overdue_invoices_summary,
+        "today_date": today_date,
         "user_stats": user_stats,  # For smart banner
         "time_entries_count": time_entries_count,  # For donation widget
         "total_hours": total_hours,  # For donation widget
@@ -344,6 +523,7 @@ def productivity_dashboard():
 
     summary = ProductivityService.get_summary(current_user)
     daily_breakdown = ProductivityService.get_daily_breakdown(current_user, days=14)
+    daily_project_breakdown = ProductivityService.get_daily_project_breakdown(current_user, days=14)
     streak = ProductivityService.get_streak(current_user)
     focus = ProductivityService.get_focus_stats(current_user, days=30)
     projects = ProductivityService.get_project_breakdown(current_user, days=30)
@@ -356,6 +536,7 @@ def productivity_dashboard():
         "main/productivity_dashboard.html",
         summary=summary,
         daily_breakdown=daily_breakdown,
+        daily_project_breakdown=daily_project_breakdown,
         streak=streak,
         focus=focus,
         projects=projects,
diff --git a/app/routes/payments.py b/app/routes/payments.py
index 6d05c42f..694967d5 100644
--- a/app/routes/payments.py
+++ b/app/routes/payments.py
@@ -1,7 +1,7 @@
 from datetime import date, datetime
 from decimal import Decimal, InvalidOperation
 
-from flask import Blueprint, flash, jsonify, redirect, render_template, request, send_file, url_for
+from flask import Blueprint, current_app, flash, jsonify, redirect, render_template, request, send_file, url_for
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
 from sqlalchemy import and_, func, or_
@@ -272,7 +272,16 @@ def create_payment():
                                     update_stock=True,
                                 )
                             except Exception as e:
-                                pass  # Don't fail payment creation on stock errors
+                                current_app.logger.warning(
+                                    "Payment saved but inventory stock update failed for invoice %s: %s",
+                                    invoice.id,
+                                    e,
+                                    exc_info=True,
+                                )
+                                flash(
+                                    _("Payment saved, but inventory could not be updated. Please verify stock levels."),
+                                    "warning",
+                                )
 
         if not safe_commit("create_payment", {"invoice_id": invoice_id, "amount": float(amount)}):
             flash(_("Could not create payment due to a database error. Please check server logs."), "error")
diff --git a/app/routes/recurring_tasks.py b/app/routes/recurring_tasks.py
index 8f3e4187..8a468c99 100644
--- a/app/routes/recurring_tasks.py
+++ b/app/routes/recurring_tasks.py
@@ -9,26 +9,94 @@
 from flask_login import current_user, login_required
 
 from app import db
-from app.models import Project
+from app.models import Project, User
 from app.models.recurring_task import RecurringTask
+from app.utils.db import safe_commit
 from app.utils.module_helpers import module_enabled
 
 recurring_tasks_bp = Blueprint("recurring_tasks", __name__)
 
 
+def _can_manage_recurring_task(recurring_task):
+    return current_user.is_admin or recurring_task.created_by == current_user.id
+
+
+def _active_projects():
+    return Project.query.filter_by(status="active").order_by(Project.name).all()
+
+
+def _active_users():
+    return User.query.filter_by(is_active=True).order_by(User.username).all()
+
+
+def _parse_recurring_task_form(data):
+    """Parse recurring task fields from form or JSON payload."""
+    end_date_raw = data.get("end_date")
+    estimated_raw = data.get("estimated_hours")
+    assigned_raw = data.get("assigned_to")
+
+    return {
+        "name": (data.get("name") or "").strip(),
+        "project_id": int(data.get("project_id")),
+        "frequency": data.get("frequency"),
+        "next_run_date": datetime.strptime(data.get("next_run_date"), "%Y-%m-%d").date(),
+        "interval": int(data.get("interval", 1) or 1),
+        "end_date": datetime.strptime(end_date_raw, "%Y-%m-%d").date() if end_date_raw else None,
+        "task_name_template": (data.get("task_name_template") or data.get("name") or "").strip(),
+        "description": data.get("description"),
+        "priority": data.get("priority", "medium"),
+        "estimated_hours": float(estimated_raw) if estimated_raw else None,
+        "assigned_to": int(assigned_raw) if assigned_raw else None,
+        "auto_assign": bool(data.get("auto_assign", False)),
+    }
+
+
+def _apply_recurring_task_fields(recurring_task, fields):
+    recurring_task.name = fields["name"]
+    recurring_task.project_id = fields["project_id"]
+    recurring_task.frequency = fields["frequency"]
+    recurring_task.next_run_date = fields["next_run_date"]
+    recurring_task.interval = fields["interval"]
+    recurring_task.end_date = fields["end_date"]
+    recurring_task.task_name_template = fields["task_name_template"]
+    recurring_task.description = fields["description"]
+    recurring_task.priority = fields["priority"]
+    recurring_task.estimated_hours = fields["estimated_hours"]
+    recurring_task.assigned_to = fields["assigned_to"]
+    recurring_task.auto_assign = fields["auto_assign"]
+
+
 @recurring_tasks_bp.route("/recurring-tasks")
 @login_required
 @module_enabled("recurring_tasks")
 def list_recurring_tasks():
     """List all recurring tasks"""
+    status_filter = request.args.get("status", "all")
+    project_filter = request.args.get("project_id", type=int)
+
     if current_user.is_admin:
-        recurring_tasks = RecurringTask.query.order_by(RecurringTask.next_run_date.asc()).all()
+        query = RecurringTask.query
     else:
-        recurring_tasks = (
-            RecurringTask.query.filter_by(created_by=current_user.id).order_by(RecurringTask.next_run_date.asc()).all()
-        )
+        query = RecurringTask.query.filter_by(created_by=current_user.id)
+
+    if status_filter == "active":
+        query = query.filter_by(is_active=True)
+    elif status_filter == "inactive":
+        query = query.filter_by(is_active=False)
 
-    return render_template("recurring_tasks/list.html", recurring_tasks=recurring_tasks)
+    if project_filter:
+        query = query.filter_by(project_id=project_filter)
+
+    recurring_tasks = query.order_by(RecurringTask.next_run_date.asc()).all()
+    projects = _active_projects()
+
+    return render_template(
+        "recurring_tasks/list.html",
+        recurring_tasks=recurring_tasks,
+        projects=projects,
+        status_filter=status_filter,
+        project_filter=project_filter,
+    )
 
 
 @recurring_tasks_bp.route("/recurring-tasks/create", methods=["GET", "POST"])
@@ -38,25 +106,34 @@ def create_recurring_task():
     """Create a new recurring task"""
     if request.method == "POST":
         data = request.get_json() if request.is_json else request.form
+        fields = _parse_recurring_task_form(data)
 
         recurring_task = RecurringTask(
-            name=data.get("name"),
-            project_id=int(data.get("project_id")),
-            frequency=data.get("frequency"),
-            next_run_date=datetime.strptime(data.get("next_run_date"), "%Y-%m-%d").date(),
+            name=fields["name"],
+            project_id=fields["project_id"],
+            frequency=fields["frequency"],
+            next_run_date=fields["next_run_date"],
             created_by=current_user.id,
-            interval=int(data.get("interval", 1)),
-            end_date=datetime.strptime(data.get("end_date"), "%Y-%m-%d").date() if data.get("end_date") else None,
-            task_name_template=data.get("task_name_template", data.get("name")),
-            description=data.get("description"),
-            priority=data.get("priority", "medium"),
-            estimated_hours=float(data.get("estimated_hours")) if data.get("estimated_hours") else None,
-            assigned_to=int(data.get("assigned_to")) if data.get("assigned_to") else None,
-            auto_assign=bool(data.get("auto_assign", False)),
+            interval=fields["interval"],
+            end_date=fields["end_date"],
+            task_name_template=fields["task_name_template"],
+            description=fields["description"],
+            priority=fields["priority"],
+            estimated_hours=fields["estimated_hours"],
+            assigned_to=fields["assigned_to"],
+            auto_assign=fields["auto_assign"],
         )
 
         db.session.add(recurring_task)
-        db.session.commit()
+        if not safe_commit("create_recurring_task"):
+            if request.is_json:
+                return jsonify({"error": "Database error"}), 500
+            flash(_("Could not create recurring task due to a database error."), "error")
+            return render_template(
+                "recurring_tasks/create.html",
+                projects=_active_projects(),
+                users=_active_users(),
+            )
 
         if request.is_json:
             return jsonify({"success": True, "recurring_task": recurring_task.to_dict()})
@@ -64,10 +141,11 @@ def create_recurring_task():
         flash(_("Recurring task created successfully"), "success")
         return redirect(url_for("recurring_tasks.list_recurring_tasks"))
 
-    # GET - Show form
-    projects = Project.query.filter_by(status="active").order_by(Project.name).all()
-
-    return render_template("recurring_tasks/create.html", projects=projects)
+    return render_template(
+        "recurring_tasks/create.html",
+        projects=_active_projects(),
+        users=_active_users(),
+    )
 
 
 @recurring_tasks_bp.route("/recurring-tasks/<int:task_id>")
@@ -77,13 +155,75 @@ def view_recurring_task(task_id):
     """View recurring task details"""
     recurring_task = RecurringTask.query.get_or_404(task_id)
 
-    if recurring_task.created_by != current_user.id and not current_user.is_admin:
+    if not _can_manage_recurring_task(recurring_task):
         flash(_("Access denied"), "error")
         return redirect(url_for("recurring_tasks.list_recurring_tasks"))
 
     return render_template("recurring_tasks/view.html", recurring_task=recurring_task)
 
 
+@recurring_tasks_bp.route("/recurring-tasks/<int:task_id>/edit", methods=["GET", "POST"])
+@login_required
+@module_enabled("recurring_tasks")
+def edit_recurring_task(task_id):
+    """Edit a recurring task"""
+    recurring_task = RecurringTask.query.get_or_404(task_id)
+
+    if not _can_manage_recurring_task(recurring_task):
+        flash(_("Access denied"), "error")
+        return redirect(url_for("recurring_tasks.list_recurring_tasks"))
+
+    if request.method == "POST":
+        data = request.get_json() if request.is_json else request.form
+        fields = _parse_recurring_task_form(data)
+        _apply_recurring_task_fields(recurring_task, fields)
+
+        if not safe_commit("edit_recurring_task", {"task_id": task_id}):
+            if request.is_json:
+                return jsonify({"error": "Database error"}), 500
+            flash(_("Could not update recurring task due to a database error."), "error")
+            return render_template(
+                "recurring_tasks/edit.html",
+                recurring_task=recurring_task,
+                projects=_active_projects(),
+                users=_active_users(),
+            )
+
+        if request.is_json:
+            return jsonify({"success": True, "recurring_task": recurring_task.to_dict()})
+
+        flash(_("Recurring task updated successfully"), "success")
+        return redirect(url_for("recurring_tasks.view_recurring_task", task_id=recurring_task.id))
+
+    return render_template(
+        "recurring_tasks/edit.html",
+        recurring_task=recurring_task,
+        projects=_active_projects(),
+        users=_active_users(),
+    )
+
+
+@recurring_tasks_bp.route("/recurring-tasks/<int:task_id>/delete", methods=["POST"])
+@login_required
+@module_enabled("recurring_tasks")
+def delete_recurring_task(task_id):
+    """Delete a recurring task"""
+    recurring_task = RecurringTask.query.get_or_404(task_id)
+
+    if not _can_manage_recurring_task(recurring_task):
+        flash(_("Access denied"), "error")
+        return redirect(url_for("recurring_tasks.list_recurring_tasks"))
+
+    name = recurring_task.name
+    db.session.delete(recurring_task)
+    if not safe_commit("delete_recurring_task", {"task_id": task_id}):
+        flash(_("Could not delete recurring task due to a database error."), "error")
+        return redirect(url_for("recurring_tasks.list_recurring_tasks"))
+
+    flash(_("Recurring task \"%(name)s\" deleted successfully", name=name), "success")
+    return redirect(url_for("recurring_tasks.list_recurring_tasks"))
+
+
 @recurring_tasks_bp.route("/recurring-tasks/<int:task_id>/toggle", methods=["POST"])
 @login_required
 @module_enabled("recurring_tasks")
@@ -91,10 +231,42 @@ def toggle_recurring_task(task_id):
     """Toggle recurring task active status"""
     recurring_task = RecurringTask.query.get_or_404(task_id)
 
-    if recurring_task.created_by != current_user.id and not current_user.is_admin:
+    if not _can_manage_recurring_task(recurring_task):
         return jsonify({"error": "Access denied"}), 403
 
     recurring_task.is_active = not recurring_task.is_active
-    db.session.commit()
+    if not safe_commit("toggle_recurring_task", {"task_id": task_id}):
+        return jsonify({"error": "Database error"}), 500
 
     return jsonify({"success": True, "is_active": recurring_task.is_active})
+
+
+@recurring_tasks_bp.route("/recurring-tasks/<int:task_id>/run-now", methods=["POST"])
+@login_required
+@module_enabled("recurring_tasks")
+def run_recurring_task_now(task_id):
+    """Immediately create a task from this recurring template"""
+    recurring_task = RecurringTask.query.get_or_404(task_id)
+
+    if not _can_manage_recurring_task(recurring_task):
+        return jsonify({"error": "Access denied"}), 403
+
+    if not recurring_task.is_active:
+        return jsonify({"error": _("Recurring task is inactive")}), 400
+
+    if recurring_task.end_date and recurring_task.next_run_date > recurring_task.end_date:
+        return jsonify({"error": _("Recurring task has passed its end date")}), 400
+
+    try:
+        task = recurring_task.create_task()
+        return jsonify(
+            {
+                "success": True,
+                "task": task.to_dict() if hasattr(task, "to_dict") else {"id": task.id, "name": task.name},
+                "last_created_at": recurring_task.last_created_at.isoformat() if recurring_task.last_created_at else None,
+                "next_run_date": recurring_task.next_run_date.isoformat() if recurring_task.next_run_date else None,
+            }
+        )
+    except Exception:
+        db.session.rollback()
+        return jsonify({"error": _("Could not create task")}), 500
diff --git a/app/routes/timer.py b/app/routes/timer.py
index 2b2c0182..f18700f4 100644
--- a/app/routes/timer.py
+++ b/app/routes/timer.py
@@ -794,6 +794,7 @@ def timer_status():
             "timer": {
                 "id": active_timer.id,
                 "project_name": active_timer.project.name if active_timer.project else None,
+                "project_id": active_timer.project_id,
                 "client_name": active_timer.client.name if active_timer.client else None,
                 "start_time": active_timer.start_time.isoformat(),
                 "current_duration": active_timer.current_duration_seconds,
@@ -807,6 +808,84 @@ def timer_status():
     )
 
 
+@timer_bp.route("/timer/switch-project", methods=["POST"])
+@login_required
+def switch_timer_project():
+    """Switch the active timer to a different project without stopping."""
+    active_timer = current_user.active_timer
+    if not active_timer:
+        if request.headers.get("Accept", "").find("application/json") >= 0 or request.is_json:
+            return jsonify({"success": False, "error": "no_active_timer"}), 400
+        flash(_("No active timer to switch"), "error")
+        return redirect(url_for("main.dashboard"))
+
+    payload = request.get_json(silent=True) or {}
+    new_project_id = _parse_optional_int(payload.get("project_id") or request.form.get("project_id"))
+    if not new_project_id:
+        return jsonify({"success": False, "error": "missing_project_id"}), 400
+
+    if new_project_id == active_timer.project_id:
+        return jsonify({"success": True, "timer": {"project_id": new_project_id}})
+
+    from app.utils.scope_filter import user_can_access_project
+
+    if not user_can_access_project(current_user, new_project_id):
+        return jsonify({"success": False, "error": "access_denied"}), 403
+
+    new_project = Project.query.filter_by(id=new_project_id, status="active").first()
+    if not new_project:
+        return jsonify({"success": False, "error": "invalid_project"}), 400
+
+    from app.services import TimeTrackingService
+
+    result = TimeTrackingService().update_entry(
+        entry_id=active_timer.id,
+        user_id=current_user.id,
+        is_admin=current_user.is_admin,
+        project_id=new_project_id,
+        task_id=None,
+        reason="Switched project from floating timer",
+    )
+    if not result.get("success"):
+        return jsonify({"success": False, "error": result.get("error", "update_failed")}), 400
+
+    try:
+        from app.utils.cache import invalidate_dashboard_for_user
+
+        invalidate_dashboard_for_user(current_user.id)
+    except Exception as e:
+        safe_log(current_app.logger, "debug", "Dashboard cache invalidation failed: %s", e)
+
+    return jsonify(
+        {
+            "success": True,
+            "timer": {
+                "id": active_timer.id,
+                "project_id": new_project_id,
+                "project_name": new_project.name,
+            },
+        }
+    )
+
+
+@timer_bp.route("/timer/projects")
+@login_required
+def timer_projects():
+    """Active projects for quick timer switch UI."""
+    from app.utils.scope_filter import apply_project_scope_to_model
+
+    projects_query = Project.query.filter_by(status="active").order_by(Project.name)
+    scope_p = apply_project_scope_to_model(Project, current_user)
+    if scope_p is not None:
+        projects_query = projects_query.filter(scope_p)
+    projects = projects_query.all()
+    return jsonify(
+        {
+            "projects": [{"id": p.id, "name": p.name} for p in projects],
+        }
+    )
+
+
 @timer_bp.route("/timer/edit/<int:timer_id>", methods=["GET", "POST"])
 @login_required
 def edit_timer(timer_id):
diff --git a/app/routes/workflows.py b/app/routes/workflows.py
index 91714295..629e994c 100644
--- a/app/routes/workflows.py
+++ b/app/routes/workflows.py
@@ -5,6 +5,7 @@
 from flask import Blueprint, flash, jsonify, redirect, render_template, request, url_for
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
+from sqlalchemy import func
 
 from app import db
 from app.models.workflow import WorkflowExecution, WorkflowRule, WorkflowTemplate
@@ -39,7 +40,34 @@ def list_workflows():
         .all()
     )
 
-    return render_template("workflows/list.html", workflows=workflows)
+    workflow_ids = [w.id for w in workflows]
+    last_executions = {}
+    if workflow_ids:
+        subq = (
+            db.session.query(
+                WorkflowExecution.rule_id,
+                func.max(WorkflowExecution.executed_at).label("max_executed_at"),
+            )
+            .filter(WorkflowExecution.rule_id.in_(workflow_ids))
+            .group_by(WorkflowExecution.rule_id)
+            .subquery()
+        )
+        rows = (
+            db.session.query(WorkflowExecution)
+            .join(
+                subq,
+                (WorkflowExecution.rule_id == subq.c.rule_id)
+                & (WorkflowExecution.executed_at == subq.c.max_executed_at),
+            )
+            .all()
+        )
+        last_executions = {row.rule_id: row for row in rows}
+
+    return render_template(
+        "workflows/list.html",
+        workflows=workflows,
+        last_executions=last_executions,
+    )
 
 
 @workflows_bp.route("/workflows/create", methods=["GET", "POST"])
diff --git a/app/services/invoice_service.py b/app/services/invoice_service.py
index 3caf0bf6..eea5632e 100644
--- a/app/services/invoice_service.py
+++ b/app/services/invoice_service.py
@@ -22,6 +22,61 @@ def __init__(self):
         self.invoice_repo = InvoiceRepository()
         self.project_repo = ProjectRepository()
 
+    @staticmethod
+    def _resolve_currency_for_project(project) -> str:
+        """Resolve invoice currency: client custom field → system settings → EUR."""
+        from app.models import Settings
+
+        client = getattr(project, "client_obj", None)
+        if client and getattr(client, "custom_fields", None):
+            currency = (client.custom_fields or {}).get("currency")
+            if currency:
+                return str(currency).upper()[:3]
+        settings = Settings.get_settings()
+        if settings and getattr(settings, "currency", None):
+            return settings.currency
+        return "EUR"
+
+    @staticmethod
+    def _resolve_tax_rate_for_project(project, issue_date: Optional[date] = None) -> Decimal:
+        """Resolve tax rate: TaxRule (project → client) → project custom field → client custom field → 0."""
+        from app.models import Settings
+        from app.models.tax_rule import TaxRule
+
+        today = issue_date or date.today()
+        query = TaxRule.query.filter(TaxRule.active == True)
+        query = query.filter(
+            (TaxRule.start_date.is_(None) | (TaxRule.start_date <= today)),
+            (TaxRule.end_date.is_(None) | (TaxRule.end_date >= today)),
+        )
+        candidates = []
+        if project and getattr(project, "id", None):
+            candidates = query.filter(TaxRule.project_id == project.id).all()
+        if not candidates and project and getattr(project, "client_id", None):
+            candidates = query.filter(TaxRule.client_id == project.client_id).all()
+        if candidates:
+            candidates.sort(key=lambda r: float(r.rate_percent), reverse=True)
+            return Decimal(str(candidates[0].rate_percent))
+
+        if project and getattr(project, "custom_fields", None):
+            project_tax = (project.custom_fields or {}).get("tax_rate")
+            if project_tax is not None and str(project_tax).strip() != "":
+                return Decimal(str(project_tax))
+
+        client = getattr(project, "client_obj", None) if project else None
+        if client and getattr(client, "custom_fields", None):
+            client_tax = (client.custom_fields or {}).get("default_tax_rate") or (client.custom_fields or {}).get(
+                "tax_rate"
+            )
+            if client_tax is not None and str(client_tax).strip() != "":
+                return Decimal(str(client_tax))
+
+        settings = Settings.get_settings()
+        if settings and getattr(settings, "company_tax_id", None):
+            # No default tax rate on settings model; fall through to zero.
+            pass
+        return Decimal("0.00")
+
     def create_invoice_from_time_entries(
         self,
         project_id: int,
@@ -62,8 +117,10 @@ def create_invoice_from_time_entries(
                 rate = project.hourly_rate or Decimal("0.00")
                 subtotal += hours * rate
 
-        # Get tax rate (from project or default)
-        tax_rate = Decimal("0.00")  # Should come from project/client settings
+        # Resolve tax rate and currency from project/client/settings
+        resolved_issue_date = issue_date or date.today()
+        tax_rate = self._resolve_tax_rate_for_project(project, resolved_issue_date)
+        currency_code = self._resolve_currency_for_project(project)
         tax_amount = subtotal * (tax_rate / 100)
         total_amount = subtotal + tax_amount
 
@@ -74,14 +131,14 @@ def create_invoice_from_time_entries(
             client_id=project.client_id,
             # Project.client is a string property; relationship is Project.client_obj
             client_name=(project.client_obj.name if getattr(project, "client_obj", None) else project.client) or "",
-            issue_date=issue_date or date.today(),
+            issue_date=resolved_issue_date,
             due_date=due_date or date.today(),
             status=InvoiceStatus.DRAFT.value,
             subtotal=subtotal,
             tax_rate=tax_rate,
             tax_amount=tax_amount,
             total_amount=total_amount,
-            currency_code="EUR",  # Should come from project/client
+            currency_code=currency_code,
             created_by=created_by,
         )
 
@@ -109,6 +166,13 @@ def create_invoice_from_time_entries(
 
         grouped_entries = items  # for telemetry line_item_count
 
+        if include_expenses:
+            from app.models import Expense
+
+            uninvoiced_expenses = Expense.get_uninvoiced_expenses(project_id=project_id)
+            for expense in uninvoiced_expenses:
+                expense.mark_as_invoiced(invoice.id)
+
         # Derive subtotal/tax/total from the persisted line items. Invoice.__init__
         # ignores subtotal/tax_amount/total_amount kwargs, so the values passed to
         # invoice_repo.create() above never stick; recompute from the items (whose
@@ -242,6 +306,20 @@ def create_invoice(
 
     def mark_as_sent(self, invoice_id: int) -> Dict[str, Any]:
         """Mark an invoice as sent and mark associated time entries as paid"""
+        from app.models import Invoice
+
+        invoice_before = self.invoice_repo.get_by_id(invoice_id)
+        sent_statuses = ("sent", "paid", "overdue", "issued")
+        was_first_send = bool(
+            invoice_before
+            and invoice_before.status == "draft"
+            and Invoice.query.filter(
+                Invoice.created_by == invoice_before.created_by,
+                Invoice.status.in_(sent_statuses),
+            ).count()
+            == 0
+        )
+
         invoice = self.invoice_repo.mark_as_sent(invoice_id)
 
         if not invoice:
@@ -261,6 +339,20 @@ def mark_as_sent(self, invoice_id: int) -> Dict[str, Any]:
         if marked_count > 0:
             message += f" ({marked_count} time entr{'y' if marked_count == 1 else 'ies'} marked as paid)"
 
+        try:
+            from app.utils.support_invoice_sent import queue_first_invoice_support_prompt
+
+            queue_first_invoice_support_prompt(invoice.created_by, first_send=was_first_send)
+        except Exception as exc:
+            from flask import current_app
+
+            current_app.logger.warning(
+                "Invoice marked sent but support prompt queue failed for invoice %s: %s",
+                invoice.id,
+                exc,
+                exc_info=True,
+            )
+
         return {"success": True, "message": message, "invoice": invoice}
 
     def mark_as_paid(
@@ -840,8 +932,15 @@ def create_client_unbilled_invoice(self, client_id: int, acting_user_id: int) ->
             primary = Contact.get_primary_contact(client_id)
             if primary and primary.email:
                 client_email = primary.email
-        except Exception:
-            pass
+        except Exception as exc:
+            from flask import current_app
+
+            current_app.logger.warning(
+                "Could not resolve primary contact email for client %s: %s",
+                client_id,
+                exc,
+                exc_info=True,
+            )
 
         tax_rate = Decimal("0")
         notes = settings.invoice_notes if settings and settings.invoice_notes else None
diff --git a/app/services/mention_service.py b/app/services/mention_service.py
index ebce4d61..dcc85224 100644
--- a/app/services/mention_service.py
+++ b/app/services/mention_service.py
@@ -130,8 +130,15 @@ def _deliver_web_push(user, note):
         subscriptions = PushSubscription.get_user_subscriptions(user.id)
         if subscriptions:
             _deliver_push_to_subscriptions(user, subscriptions, note)
-    except Exception:
-        pass
+    except Exception as exc:
+        from flask import current_app
+
+        current_app.logger.warning(
+            "Failed to deliver mention web push to user %s: %s",
+            user.id,
+            exc,
+            exc_info=True,
+        )
 
 
 def _emit_socket(user, note):
@@ -140,5 +147,12 @@ def _emit_socket(user, note):
         from app import socketio
 
         socketio.emit("user_mentioned", note, room=f"user_{user.id}")
-    except Exception:
-        pass
+    except Exception as exc:
+        from flask import current_app
+
+        current_app.logger.warning(
+            "Failed to emit mention socket event to user %s: %s",
+            user.id,
+            exc,
+            exc_info=True,
+        )
diff --git a/app/services/productivity_service.py b/app/services/productivity_service.py
index 70b9649a..bacad7a1 100644
--- a/app/services/productivity_service.py
+++ b/app/services/productivity_service.py
@@ -338,6 +338,94 @@ def get_daily_breakdown(cls, user, days: int = 14) -> List[Dict[str, Any]]:
             logger.exception("ProductivityService.get_daily_breakdown failed for user %s", uid)
             return []
 
+    @classmethod
+    def get_daily_project_breakdown(cls, user, days: int = 14) -> Dict[str, Any]:
+        """Stacked daily hours by project for charting (last N days, oldest first)."""
+        empty: Dict[str, Any] = {"dates": [], "projects": [], "hours_by_day_project": {}}
+        try:
+            days = max(1, min(int(days), 90))
+        except (TypeError, ValueError):
+            days = 14
+
+        uid = _safe_user_id(user)
+        if uid is None:
+            return empty
+
+        try:
+            today = _user_today(user)
+            start_day = today - timedelta(days=days - 1)
+            start_dt, end_dt = _user_period_bounds_app_naive(user, start_day, today)
+            user_tz = get_timezone_for_user(user)
+            app_tz = get_timezone_obj()
+
+            rows = (
+                db.session.query(
+                    TimeEntry.start_time,
+                    TimeEntry.duration_seconds,
+                    TimeEntry.project_id,
+                    Project.name,
+                )
+                .outerjoin(Project, TimeEntry.project_id == Project.id)
+                .filter(
+                    TimeEntry.user_id == uid,
+                    TimeEntry.end_time.isnot(None),
+                    TimeEntry.start_time >= start_dt,
+                    TimeEntry.start_time < end_dt,
+                )
+                .all()
+            )
+
+            by_day_project: Dict[str, Dict[str, float]] = defaultdict(lambda: defaultdict(float))
+            project_meta: Dict[str, Dict[str, Any]] = {}
+
+            for start_time, duration_seconds, project_id, project_name in rows:
+                local_dt = _to_user_local(start_time, user_tz, app_tz)
+                if local_dt is None:
+                    continue
+                day_key = local_dt.date().isoformat()
+                pid = str(project_id or 0)
+                label = (project_name or "No project").strip()
+                hours = (int(duration_seconds or 0)) / 3600.0
+                by_day_project[day_key][pid] += hours
+                if pid not in project_meta:
+                    palette_idx = (int(project_id or 0)) % len(_PROJECT_PALETTE)
+                    project_meta[pid] = {
+                        "id": project_id,
+                        "name": label,
+                        "color": _PROJECT_PALETTE[palette_idx],
+                    }
+
+            dates: List[str] = []
+            hours_by_day_project: Dict[str, Dict[str, float]] = {}
+            cur = start_day
+            while cur <= today:
+                day_key = cur.isoformat()
+                dates.append(day_key)
+                day_map = by_day_project.get(day_key, {})
+                hours_by_day_project[day_key] = {
+                    pid: round(h, 2) for pid, h in day_map.items() if h > 0
+                }
+                cur += timedelta(days=1)
+
+            # Top projects by total hours in window (limit legend/chart clutter)
+            totals: Dict[str, float] = defaultdict(float)
+            for day_map in hours_by_day_project.values():
+                for pid, h in day_map.items():
+                    totals[pid] += h
+            top_pids = [
+                pid for pid, _ in sorted(totals.items(), key=lambda item: item[1], reverse=True)[:8]
+            ]
+            projects = [project_meta[pid] for pid in top_pids if pid in project_meta]
+
+            return {
+                "dates": dates,
+                "projects": projects,
+                "hours_by_day_project": hours_by_day_project,
+            }
+        except Exception:
+            logger.exception("ProductivityService.get_daily_project_breakdown failed for user %s", uid)
+            return empty
+
     # ---------------------------------------------------------------- streak
 
     @classmethod
diff --git a/app/services/support_prompt_service.py b/app/services/support_prompt_service.py
index 817f05ee..5e9c6e3b 100644
--- a/app/services/support_prompt_service.py
+++ b/app/services/support_prompt_service.py
@@ -12,12 +12,20 @@ class SupportPromptService:
     SESSION_PROMPT_TRIGGER = "support_prompt_trigger"
     SESSION_SEVEN_DAY_OFFERED = "support_prompt_7d_offered"
     SESSION_ACTIVE_DAY_OFFERED = "support_prompt_active_day_offered"
+    SESSION_ANNIVERSARY_30D_OFFERED = "support_prompt_30d_offered"
+    SESSION_HOURS_MILESTONE_OFFERED = "support_prompt_hours_milestone_offered"
 
     VARIANT_AFTER_REPORT = "after_report"
+    VARIANT_FIRST_INVOICE = "first_invoice"
     VARIANT_SEVEN_DAY = "seven_day"
+    VARIANT_ANNIVERSARY_30D = "anniversary_30d"
+    VARIANT_HOURS_MILESTONE = "hours_milestone"
     VARIANT_ACTIVE_TODAY = "active_today"
     VARIANT_LONG_SESSION = "long_session"
 
+    LAYOUT_TRIGGER_VARIANTS = frozenset({VARIANT_AFTER_REPORT, VARIANT_FIRST_INVOICE})
+    HOURS_MILESTONES = (1000, 500, 100)
+
     @staticmethod
     def _base_eligible(
         session: Dict[str, Any],
@@ -56,11 +64,12 @@ def consume_layout_prompt(
         ):
             return None
         trigger = session.get(SupportPromptService.SESSION_PROMPT_TRIGGER)
-        if trigger != SupportPromptService.VARIANT_AFTER_REPORT:
+        if trigger not in SupportPromptService.LAYOUT_TRIGGER_VARIANTS:
             return None
         session.pop(SupportPromptService.SESSION_PROMPT_TRIGGER, None)
         session[SupportPromptService.SESSION_SOFT_PROMPT_CONSUMED] = True
-        return {"variant": SupportPromptService.VARIANT_AFTER_REPORT, "source": "after_report"}
+        source = "after_report" if trigger == SupportPromptService.VARIANT_AFTER_REPORT else "first_invoice"
+        return {"variant": trigger, "source": source}
 
     @staticmethod
     def pick_dashboard_prompt(
@@ -83,11 +92,24 @@ def pick_dashboard_prompt(
             support_banner_suppressed=support_banner_suppressed,
         ):
             return None
-        # After-report takes priority; leave trigger for layout pass
-        if session.get(SupportPromptService.SESSION_PROMPT_TRIGGER) == SupportPromptService.VARIANT_AFTER_REPORT:
+        # Layout triggers take priority; leave trigger for layout pass
+        if session.get(SupportPromptService.SESSION_PROMPT_TRIGGER) in SupportPromptService.LAYOUT_TRIGGER_VARIANTS:
             return None
 
+        total_hours = float(user_stats.get("total_hours") or 0)
+        offered_milestone = int(session.get(SupportPromptService.SESSION_HOURS_MILESTONE_OFFERED) or 0)
+        for milestone in SupportPromptService.HOURS_MILESTONES:
+            if total_hours >= milestone and offered_milestone < milestone:
+                return {
+                    "variant": SupportPromptService.VARIANT_HOURS_MILESTONE,
+                    "source": "dashboard",
+                    "milestone": milestone,
+                }
+
         days = int(user_stats.get("days_since_signup") or 0)
+        if days >= 30 and not session.get(SupportPromptService.SESSION_ANNIVERSARY_30D_OFFERED):
+            return {"variant": SupportPromptService.VARIANT_ANNIVERSARY_30D, "source": "dashboard"}
+
         if days >= 7 and not session.get(SupportPromptService.SESSION_SEVEN_DAY_OFFERED):
             return {"variant": SupportPromptService.VARIANT_SEVEN_DAY, "source": "dashboard"}
 
@@ -101,11 +123,18 @@ def mark_prompt_shown(session: Dict[str, Any], variant: str) -> None:
         session[SupportPromptService.SESSION_SOFT_PROMPT_CONSUMED] = True
         if variant == SupportPromptService.VARIANT_SEVEN_DAY:
             session[SupportPromptService.SESSION_SEVEN_DAY_OFFERED] = True
+        elif variant == SupportPromptService.VARIANT_ANNIVERSARY_30D:
+            session[SupportPromptService.SESSION_ANNIVERSARY_30D_OFFERED] = True
         elif variant == SupportPromptService.VARIANT_ACTIVE_TODAY:
             session[SupportPromptService.SESSION_ACTIVE_DAY_OFFERED] = True
         elif variant == SupportPromptService.VARIANT_LONG_SESSION:
             pass
 
+    @staticmethod
+    def mark_hours_milestone_shown(session: Dict[str, Any], milestone: int) -> None:
+        session[SupportPromptService.SESSION_SOFT_PROMPT_CONSUMED] = True
+        session[SupportPromptService.SESSION_HOURS_MILESTONE_OFFERED] = int(milestone)
+
     @staticmethod
     def long_session_prompt_allowed(
         session: Dict[str, Any],
@@ -122,6 +151,13 @@ def long_session_prompt_allowed(
             support_banner_suppressed=support_banner_suppressed,
         ):
             return False
-        if session.get(SupportPromptService.SESSION_PROMPT_TRIGGER) == SupportPromptService.VARIANT_AFTER_REPORT:
+        if session.get(SupportPromptService.SESSION_PROMPT_TRIGGER) in SupportPromptService.LAYOUT_TRIGGER_VARIANTS:
             return False
         return True
+
+    @staticmethod
+    def queue_first_invoice_prompt(session: Dict[str, Any], user_id: int, *, first_send: bool = False) -> None:
+        """Queue a one-shot support prompt after the user's first invoice is sent."""
+        if not first_send:
+            return
+        session[SupportPromptService.SESSION_PROMPT_TRIGGER] = SupportPromptService.VARIANT_FIRST_INVOICE
diff --git a/app/static/floating-timer-bar.js b/app/static/floating-timer-bar.js
index 2f4946da..61fd361e 100644
--- a/app/static/floating-timer-bar.js
+++ b/app/static/floating-timer-bar.js
@@ -1,6 +1,6 @@
 /**
  * Floating Timer Bar - Persistent mini-timer visible on all pages
- * One-click start/stop without navigating to dashboard
+ * One-click start/stop without navigating away from the current page when possible
  */
 (function () {
     'use strict';
@@ -24,6 +24,11 @@
             this.startTime = null;
             this.startLabel = 'Start Timer';
             this.stopLabel = 'Stop';
+            this.pauseLabel = 'Pause';
+            this.resumeLabel = 'Resume';
+            this.switchLabel = 'Switch project';
+            this.projectsCache = null;
+            this.switchPopover = null;
             this.init();
         }
 
@@ -32,10 +37,117 @@
             this.bar = document.getElementById('floatingTimerBar');
             this.startLabel = this.bar.dataset.startLabel || 'Start Timer';
             this.stopLabel = this.bar.dataset.stopLabel || 'Stop';
+            this.pauseLabel = this.bar.dataset.pauseLabel || 'Pause';
+            this.resumeLabel = this.bar.dataset.resumeLabel || 'Resume';
+            this.switchLabel = this.bar.dataset.switchLabel || 'Switch project';
+            this.ensureSwitchPopover();
             this.render();
             this.fetchStatus();
             this.pollTimer = setInterval(() => this.fetchStatus(), POLL_INTERVAL_MS);
             window.addEventListener('focus', () => this.fetchStatus());
+            document.addEventListener('click', (evt) => {
+                if (!this.switchPopover || this.switchPopover.classList.contains('hidden')) return;
+                if (this.switchPopover.contains(evt.target)) return;
+                if (this.bar && this.bar.contains(evt.target)) return;
+                this.hideSwitchPopover();
+            });
+        }
+
+        ensureSwitchPopover() {
+            if (this.switchPopover) return;
+            var pop = document.createElement('div');
+            pop.id = 'floatingTimerSwitchPopover';
+            pop.className = 'hidden fixed z-[70] w-72 max-w-[calc(100vw-1rem)] rounded-xl border border-border-light dark:border-border-dark bg-card-light dark:bg-card-dark shadow-xl p-3';
+            pop.innerHTML =
+                '<p class="text-sm font-semibold text-text-light dark:text-text-dark mb-2">' + escapeHtml(this.switchLabel) + '</p>' +
+                '<select class="form-input w-full text-sm mb-2" data-switch-project-select aria-label="' + escapeHtml(this.switchLabel) + '"></select>' +
+                '<div class="flex justify-end gap-2">' +
+                    '<button type="button" class="btn btn-secondary btn-sm" data-switch-cancel>Cancel</button>' +
+                    '<button type="button" class="btn btn-primary btn-sm" data-switch-apply>Apply</button>' +
+                '</div>';
+            document.body.appendChild(pop);
+            pop.querySelector('[data-switch-cancel]').addEventListener('click', () => this.hideSwitchPopover());
+            pop.querySelector('[data-switch-apply]').addEventListener('click', () => this.applySwitchProject());
+            this.switchPopover = pop;
+        }
+
+        hideSwitchPopover() {
+            if (this.switchPopover) this.switchPopover.classList.add('hidden');
+        }
+
+        positionSwitchPopover() {
+            if (!this.switchPopover || !this.bar) return;
+            var rect = this.bar.getBoundingClientRect();
+            var top = Math.max(8, rect.bottom + 8);
+            var left = Math.min(window.innerWidth - this.switchPopover.offsetWidth - 8, Math.max(8, rect.right - this.switchPopover.offsetWidth));
+            this.switchPopover.style.top = top + 'px';
+            this.switchPopover.style.left = left + 'px';
+        }
+
+        async loadProjects() {
+            if (this.projectsCache) return this.projectsCache;
+            try {
+                const res = await fetch('/timer/projects', { credentials: 'same-origin' });
+                const data = await res.json();
+                this.projectsCache = Array.isArray(data.projects) ? data.projects : [];
+            } catch (e) {
+                this.projectsCache = [];
+            }
+            return this.projectsCache;
+        }
+
+        async openSwitchPopover() {
+            this.ensureSwitchPopover();
+            const select = this.switchPopover.querySelector('[data-switch-project-select]');
+            select.innerHTML = '<option value="">Loading…</option>';
+            this.switchPopover.classList.remove('hidden');
+            this.positionSwitchPopover();
+
+            const projects = await this.loadProjects();
+            select.innerHTML = '';
+            projects.forEach((p) => {
+                const opt = document.createElement('option');
+                opt.value = String(p.id);
+                opt.textContent = p.name;
+                if (this.timerData && this.timerData.project_id === p.id) {
+                    opt.selected = true;
+                }
+                select.appendChild(opt);
+            });
+            if (!projects.length) {
+                select.innerHTML = '<option value="">' + escapeHtml('No projects') + '</option>';
+            }
+        }
+
+        async applySwitchProject() {
+            const select = this.switchPopover.querySelector('[data-switch-project-select]');
+            const projectId = select ? parseInt(select.value, 10) : NaN;
+            if (!projectId) return;
+            const token = this.getCsrfToken();
+            try {
+                const res = await fetch('/timer/switch-project', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'X-CSRFToken': token,
+                        'Accept': 'application/json',
+                    },
+                    body: JSON.stringify({ project_id: projectId }),
+                    credentials: 'same-origin',
+                });
+                const data = await res.json();
+                if (!res.ok || !data.success) {
+                    throw new Error(data.error || 'switch_failed');
+                }
+                this.hideSwitchPopover();
+                await this.fetchStatus();
+                this.refreshDashboardTimerWidget();
+            } catch (e) {
+                console.error('Switch project failed', e);
+                if (window.toastManager) {
+                    window.toastManager.error('Could not switch project', 'Error', 3000);
+                }
+            }
         }
 
         async fetchStatus() {
@@ -51,8 +163,10 @@
                     this.timerData = null;
                     this.startTime = null;
                     this.stopElapsedUpdater();
+                    this.hideSwitchPopover();
                     this.render();
                 }
+                syncFabDesktopHide(this.timerData);
             } catch (e) {
                 console.warn('FloatingTimerBar: fetch status failed', e);
             }
@@ -76,9 +190,8 @@
                 const formatted = String(h).padStart(2, '0') + ':' + String(m).padStart(2, '0') + ':' + String(s).padStart(2, '0');
                 const el = this.bar.querySelector('[data-timer-elapsed]');
                 if (el) el.textContent = formatted;
-                const btn = this.bar.querySelector('button');
-                const label = this.timerData.paused ? (this.bar.dataset.resumeLabel || 'Resume') : (this.stopLabel || 'Stop');
-                if (btn) btn.title = (this.getLabel() || 'Timer') + (this.timerData.paused ? ' (Paused) – ' : ' – ') + formatted + ' – ' + label;
+                const progressEl = this.bar.querySelector('[data-timer-progress]');
+                if (progressEl) progressEl.style.width = this.getProgressPercent(elapsedSec) + '%';
             };
             update();
             this.elapsedInterval = setInterval(update, 1000);
@@ -95,54 +208,50 @@
             const startBtn = document.querySelector('#openStartTimer');
             if (startBtn) {
                 startBtn.click();
-            } else {
-                const url = this.bar?.dataset?.manualUrl || '/timer/manual';
-                window.location.href = url;
+                return;
             }
+            const dashboardUrl = this.bar?.dataset?.dashboardUrl || '/';
+            window.location.href = dashboardUrl + (dashboardUrl.indexOf('#') >= 0 ? '' : '#start-timer');
         }
 
-        async stopTimer() {
+        async postTimerAction(url) {
             const token = this.getCsrfToken();
             try {
-                const res = await fetch('/timer/stop', {
+                await fetch(url, {
                     method: 'POST',
-                    headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'X-CSRFToken': token },
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                        'X-CSRFToken': token,
+                        'Accept': 'application/json',
+                    },
                     body: 'csrf_token=' + encodeURIComponent(token),
-                    credentials: 'same-origin'
+                    credentials: 'same-origin',
+                    redirect: 'manual',
                 });
-                if (res.redirected) {
-                    window.location.href = res.url;
-                } else {
-                    await this.fetchStatus();
-                }
+                await this.fetchStatus();
+                this.refreshDashboardTimerWidget();
             } catch (e) {
-                console.error('Stop timer failed', e);
+                console.error('Timer action failed:', url, e);
                 if (window.toastManager) {
-                    window.toastManager.error('Failed to stop timer', 'Error', 3000);
+                    window.toastManager.error('Timer action failed', 'Error', 3000);
                 }
             }
         }
 
-        async resumeTimer() {
-            const token = this.getCsrfToken();
-            try {
-                const res = await fetch('/timer/resume', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'X-CSRFToken': token },
-                    body: 'csrf_token=' + encodeURIComponent(token),
-                    credentials: 'same-origin'
-                });
-                if (res.redirected) {
-                    window.location.href = res.url;
-                } else {
-                    await this.fetchStatus();
-                }
-            } catch (e) {
-                console.error('Resume timer failed', e);
-                if (window.toastManager) {
-                    window.toastManager.error('Failed to resume timer', 'Error', 3000);
-                }
-            }
+        stopTimer() {
+            return this.postTimerAction('/timer/stop');
+        }
+
+        pauseTimer() {
+            return this.postTimerAction('/timer/pause');
+        }
+
+        resumeTimer() {
+            return this.postTimerAction('/timer/resume');
+        }
+
+        refreshDashboardTimerWidget() {
+            document.dispatchEvent(new CustomEvent('tt:timer-status-changed'));
         }
 
         getCsrfToken() {
@@ -155,30 +264,68 @@
             return this.timerData.project_name || this.timerData.client_name || 'Timer';
         }
 
+        getDailyTargetSeconds() {
+            const raw = this.bar && this.bar.dataset.dailyTargetHours;
+            const hours = raw ? parseFloat(raw, 10) : 8;
+            const safeHours = isNaN(hours) || hours <= 0 ? 8 : hours;
+            return Math.round(safeHours * 3600);
+        }
+
+        getProgressPercent(elapsedSec) {
+            const target = this.getDailyTargetSeconds();
+            if (!target) return 0;
+            return Math.min(100, Math.round((elapsedSec / target) * 100));
+        }
+
         render() {
             if (!this.bar) return;
 
-            const baseClass = 'floating-timer-bar__round flex items-center justify-center w-10 h-10 rounded-full text-text-light dark:text-text-dark hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 text-sm transition-colors';
-            const actionLabel = this.timerData && this.timerData.paused ? (this.bar.dataset.resumeLabel || 'Resume') : (this.stopLabel || 'Stop');
-            const title = this.timerData
-                ? (escapeHtml(this.getLabel()) + (this.timerData.paused ? ' (Paused) – ' : ' – ') + (this.timerData.duration_formatted || '00:00:00') + ' – ' + escapeHtml(actionLabel))
-                : escapeHtml(this.startLabel);
+            const roundBtn = 'floating-timer-bar__round flex items-center justify-center w-8 h-8 rounded-full text-text-light dark:text-text-dark hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-primary/50 text-sm transition-colors shrink-0';
 
             if (this.timerData) {
                 const isPaused = this.timerData.paused;
                 const pulseClass = isPaused ? 'bg-amber-500' : 'bg-green-500 animate-pulse';
-                const clickHandler = isPaused ? 'window.floatingTimerBar.resumeTimer()' : 'window.floatingTimerBar.stopTimer()';
+                const elapsedSec = this.timerData.current_duration != null
+                    ? this.timerData.current_duration
+                    : (this.startTime ? Math.floor((Date.now() - this.startTime) / 1000) : 0);
+                const progressPct = this.getProgressPercent(elapsedSec);
+                const label = escapeHtml(this.getLabel());
+                const elapsed = this.timerData.duration_formatted || '00:00:00';
+                const pauseResumeLabel = isPaused ? this.resumeLabel : this.pauseLabel;
+                const pauseResumeIcon = isPaused ? 'play' : 'pause';
+                const pauseResumeAction = isPaused ? 'resumeTimer' : 'pauseTimer';
+
+                this.bar.className = 'flex shrink-0 items-center gap-1 floating-timer-bar--active';
                 this.bar.innerHTML = `
-                    <button type="button" class="${baseClass} relative" onclick="${clickHandler}" title="${title}" aria-label="${escapeHtml(actionLabel)} – ${escapeHtml(this.getLabel())}">
-                        <span class="absolute top-1.5 right-1.5 w-2 h-2 rounded-full ${pulseClass}" aria-hidden="true"></span>
-                        <i class="fas fa-${isPaused ? 'pause' : 'stopwatch'} text-base"></i>
-                        <span class="floating-timer-bar__elapsed sr-only" data-timer-elapsed>${this.timerData.duration_formatted || '00:00:00'}</span>
-                    </button>
+                    <div class="relative flex items-center gap-1.5 px-2 py-1 rounded-full bg-gray-100 dark:bg-gray-800 border border-border-light dark:border-border-dark" title="${label}${isPaused ? ' (Paused)' : ''}">
+                        <span class="absolute top-0.5 left-2 w-2 h-2 rounded-full ${pulseClass}" aria-hidden="true"></span>
+                        <span class="floating-timer-bar__elapsed font-mono text-xs font-semibold tabular-nums text-text-light dark:text-text-dark pl-3 min-w-[4.5rem]" data-timer-elapsed>${elapsed}</span>
+                        <button type="button" class="${roundBtn}" data-switch-project-btn title="${escapeHtml(this.switchLabel)}" aria-label="${escapeHtml(this.switchLabel)}">
+                            <i class="fas fa-right-left text-xs"></i>
+                        </button>
+                        <button type="button" class="${roundBtn}" onclick="window.floatingTimerBar.${pauseResumeAction}()" title="${escapeHtml(pauseResumeLabel)}" aria-label="${escapeHtml(pauseResumeLabel)}">
+                            <i class="fas fa-${pauseResumeIcon} text-xs"></i>
+                        </button>
+                        <button type="button" class="${roundBtn}" onclick="window.floatingTimerBar.stopTimer()" title="${escapeHtml(this.stopLabel)}" aria-label="${escapeHtml(this.stopLabel)}">
+                            <i class="fas fa-stop text-xs"></i>
+                        </button>
+                        <div class="absolute -bottom-0.5 left-2 right-2 h-0.5 rounded-full bg-gray-200 dark:bg-gray-700 overflow-hidden" aria-hidden="true">
+                            <div class="h-full bg-primary transition-all duration-1000" data-timer-progress style="width: ${progressPct}%;"></div>
+                        </div>
+                    </div>
                 `;
+                const switchBtn = this.bar.querySelector('[data-switch-project-btn]');
+                if (switchBtn) {
+                    switchBtn.addEventListener('click', (evt) => {
+                        evt.stopPropagation();
+                        this.openSwitchPopover();
+                    });
+                }
                 this.startElapsedUpdater();
             } else {
+                this.bar.className = 'flex shrink-0 items-center justify-center';
                 this.bar.innerHTML = `
-                    <button type="button" class="${baseClass}" onclick="window.floatingTimerBar.startTimer()" title="${title}" aria-label="${escapeHtml(this.startLabel)}">
+                    <button type="button" class="${roundBtn} w-9 h-9" onclick="window.floatingTimerBar.startTimer()" title="${escapeHtml(this.startLabel)}" aria-label="${escapeHtml(this.startLabel)}">
                         <i class="fas fa-play text-base"></i>
                     </button>
                 `;
@@ -189,6 +336,10 @@
         destroy() {
             this.stopElapsedUpdater();
             if (this.pollTimer) clearInterval(this.pollTimer);
+            if (this.switchPopover) {
+                this.switchPopover.remove();
+                this.switchPopover = null;
+            }
         }
     }
 
@@ -201,6 +352,7 @@
     const style = document.createElement('style');
     style.textContent = `
         .floating-timer-bar__round { cursor: pointer; }
+        .floating-timer-bar--active { max-width: 13rem; }
         @media (prefers-reduced-motion: reduce) {
             .floating-timer-bar__round .animate-pulse { animation: none; }
         }
diff --git a/app/static/idle.js b/app/static/idle.js
index 05b6e400..63be8169 100644
--- a/app/static/idle.js
+++ b/app/static/idle.js
@@ -73,6 +73,32 @@
     if (countdownIntervalId) { clearInterval(countdownIntervalId); countdownIntervalId = null; }
   }
 
+  async function refreshTimerUiAfterStop(){
+    try {
+      if (window.floatingTimerBar && typeof window.floatingTimerBar.fetchStatus === 'function') {
+        await window.floatingTimerBar.fetchStatus();
+      }
+      document.dispatchEvent(new CustomEvent('tt:timer-status-changed'));
+    } catch(e) {}
+  }
+
+  async function stopNow(){
+    clearGraceTimers();
+    promptShown = false;
+    try {
+      const r = await fetch('/api/timer/stop', { method: 'POST', headers: { 'Content-Type': 'application/json' }, __ttQuiet: true });
+      if (r.ok){
+        const msg = window.i18n?.messages?.timerStopped || 'Timer stopped';
+        if (window.toastManager && window.toastManager.success) {
+          window.toastManager.success(msg, '', 5000);
+        } else if (window.toastManager && window.toastManager.show) {
+          window.toastManager.show({ message: msg, type: 'success', duration: 5000 });
+        }
+        await refreshTimerUiAfterStop();
+      }
+    } catch(e) {}
+  }
+
   async function stopAt(ts){
     clearGraceTimers();
     promptShown = false;
@@ -87,7 +113,7 @@
         } else {
           alert(msg);
         }
-        location.reload();
+        await refreshTimerUiAfterStop();
       }
     } catch(e) {}
   }
@@ -107,6 +133,7 @@
 
     const yesLabel = window.i18n?.messages?.stillWorkingYes || 'Yes, still working';
     const noLabel = window.i18n?.messages?.stillWorkingNo || 'No, stop timer';
+    const trimLabel = window.i18n?.messages?.stillWorkingTrim || 'Keep until idle';
     const baseMsg = window.i18n?.messages?.stillWorkingPrompt ||
       ('Still working? You seem inactive since ' + formatTime(new Date(stopTs)) +
        '. Timer will stop automatically if you do not answer.');
@@ -120,8 +147,10 @@
     function attachHandlers(toastEl, countdownEl){
       const yesBtn = toastEl.querySelector('[data-act="yes"]');
       const noBtn = toastEl.querySelector('[data-act="no"]');
+      const trimBtn = toastEl.querySelector('[data-act="trim"]');
       if (yesBtn) yesBtn.addEventListener('click', function(){ snoozeIdlePrompt(toastEl); });
-      if (noBtn) noBtn.addEventListener('click', function(){ try { toastEl.remove(); } catch(e){}; stopAt(stopTs); });
+      if (noBtn) noBtn.addEventListener('click', function(){ try { toastEl.remove(); } catch(e){}; stopNow(); });
+      if (trimBtn) trimBtn.addEventListener('click', function(){ try { toastEl.remove(); } catch(e){}; stopAt(stopTs); });
 
       countdownIntervalId = setInterval(function(){
         if (countdownEl) countdownEl.textContent = buildMessage();
@@ -139,8 +168,9 @@
       toastEl.className = 'flex items-center gap-3 p-4 bg-amber-100 dark:bg-amber-900/30 border border-amber-300 dark:border-amber-700 rounded-lg shadow-lg pointer-events-auto';
       toastEl.innerHTML =
         '<div class="flex-1 text-sm text-amber-900 dark:text-amber-100" data-countdown>' + buildMessage() + '</div>' +
-        '<div class="flex gap-2">' +
+        '<div class="flex gap-2 flex-wrap justify-end">' +
           '<button class="px-3 py-1.5 bg-amber-600 hover:bg-amber-700 text-white rounded text-sm font-medium" data-act="yes">' + yesLabel + '</button>' +
+          '<button class="px-3 py-1.5 bg-amber-200 dark:bg-amber-800 hover:bg-amber-300 dark:hover:bg-amber-700 text-amber-900 dark:text-amber-100 rounded text-sm font-medium" data-act="trim">' + trimLabel + '</button>' +
           '<button class="px-3 py-1.5 bg-amber-200 dark:bg-amber-800 hover:bg-amber-300 dark:hover:bg-amber-700 text-amber-900 dark:text-amber-100 rounded text-sm font-medium" data-act="no">' + noLabel + '</button>' +
         '</div>';
       const container = document.getElementById('toast-notification-container') || document.getElementById('flash-messages-container') || document.body;
@@ -156,6 +186,7 @@
         '<div class="toast-body" data-countdown>' + buildMessage() + '</div>' +
         '<div class="d-flex gap-2 align-items-center me-2">' +
           '<button class="btn btn-sm btn-light" data-act="yes">' + yesLabel + '</button>' +
+          '<button class="btn btn-sm btn-outline-light" data-act="trim">' + trimLabel + '</button>' +
           '<button class="btn btn-sm btn-outline-light" data-act="no">' + noLabel + '</button>' +
         '</div>' +
       '</div>';
@@ -164,16 +195,61 @@
     attachHandlers(t, t.querySelector('[data-countdown]'));
   }
 
+  let longEntryNudgeShown = false;
+  let lastLongEntryTimerId = null;
+
+  function getLongEntryThresholdMs(){
+    const meta = document.querySelector('meta[name="long-entry-threshold-hours"]');
+    const hours = meta ? parseFloat(meta.getAttribute('content'), 10) : 8;
+    return (isNaN(hours) || hours < 1 ? 8 : Math.min(24, hours)) * 60 * 60 * 1000;
+  }
+
+  async function checkLongRunningTimer(active){
+    if (!active || !active.start_time) return;
+    if (active.id !== lastLongEntryTimerId) {
+      lastLongEntryTimerId = active.id;
+      longEntryNudgeShown = false;
+    }
+    if (longEntryNudgeShown || activeReminderToast) return;
+    const started = new Date(active.start_time).getTime();
+    if (isNaN(started)) return;
+    const runningMs = Date.now() - started;
+    if (runningMs < getLongEntryThresholdMs()) return;
+    longEntryNudgeShown = true;
+    const hours = (runningMs / (60 * 60 * 1000)).toFixed(1);
+    const msg = 'Your timer has been running for ' + hours + ' hours. Did you forget to stop it?';
+    buildReminderToast(
+      'amber',
+      escapeHtml(msg),
+      [
+        {
+          label: (window.i18n?.messages?.timerStopped || 'Stop timer'),
+          style: 'primary',
+          onClick: function(){ window.floatingTimerBar && window.floatingTimerBar.stopTimer(); }
+        },
+        {
+          label: (window.i18n?.messages?.dismiss || 'Dismiss'),
+          style: 'link',
+          onClick: function(){ longEntryNudgeShown = true; }
+        }
+      ],
+      0
+    );
+  }
+
   async function tick(){
     const active = await getTimer();
     hasActiveTimer = !!active;
     if (!active) return;
+    // Send periodic heartbeat while tab is open (throttled to HEARTBEAT_THROTTLE_MS)
+    if (!promptShown) sendHeartbeat();
     const threshold = getIdleThresholdMs();
     const idleFor = Date.now() - lastActivity;
     if (idleFor >= threshold){
       const stopTs = Date.now() - idleFor;
       showIdlePrompt(stopTs);
     }
+    try { await checkLongRunningTimer(active); } catch(e) {}
     // Break reminder follows the active timer state; check on every tick.
     try { checkBreakNudge(active); } catch(e) {}
   }
@@ -382,8 +458,10 @@
           label: (window.i18n?.messages?.pauseTimer || 'Pause timer'),
           style: 'primary',
           onClick: async function(){
-            try { await fetch('/timer/pause', { method: 'POST' }); } catch(e){}
-            location.reload();
+            try {
+              await fetch('/timer/pause', { method: 'POST', redirect: 'manual', credentials: 'same-origin' });
+              await refreshTimerUiAfterStop();
+            } catch(e){}
           }
         },
         {
diff --git a/app/static/images/apple-touch-icon.png b/app/static/images/apple-touch-icon.png
new file mode 100644
index 00000000..7d222e9b
Binary files /dev/null and b/app/static/images/apple-touch-icon.png differ
diff --git a/app/static/images/favicon.ico b/app/static/images/favicon.ico
new file mode 100644
index 00000000..70b570b3
Binary files /dev/null and b/app/static/images/favicon.ico differ
diff --git a/app/static/images/og-image.png b/app/static/images/og-image.png
new file mode 100644
index 00000000..c1aefb78
Binary files /dev/null and b/app/static/images/og-image.png differ
diff --git a/app/static/notes-autocomplete.js b/app/static/notes-autocomplete.js
new file mode 100644
index 00000000..a2735349
--- /dev/null
+++ b/app/static/notes-autocomplete.js
@@ -0,0 +1,104 @@
+/**
+ * Populate description/notes autocomplete from recent time entries.
+ * Targets #notes with optional #notesSuggestions datalist, scoped by #project_id.
+ */
+(function () {
+    'use strict';
+
+    if (window.__ttNotesAutocompleteLoaded) return;
+    window.__ttNotesAutocompleteLoaded = true;
+
+    function getProjectId() {
+        var projectSelect = document.getElementById('project_id');
+        return projectSelect && projectSelect.value ? projectSelect.value : '';
+    }
+
+    function ensureDatalist() {
+        var datalist = document.getElementById('notesSuggestions');
+        if (!datalist) {
+            datalist = document.createElement('datalist');
+            datalist.id = 'notesSuggestions';
+            document.body.appendChild(datalist);
+        }
+        return datalist;
+    }
+
+    function ensureChipContainer() {
+        var host = document.getElementById('notes_editor');
+        var anchor = host ? host.parentElement : document.getElementById('notes');
+        if (!anchor) return null;
+        var container = document.getElementById('notesSuggestionChips');
+        if (!container) {
+            container = document.createElement('div');
+            container.id = 'notesSuggestionChips';
+            container.className = 'mt-2 flex flex-wrap gap-1.5';
+            anchor.insertAdjacentElement('afterend', container);
+        }
+        return container;
+    }
+
+    function applyNotesValue(value) {
+        var notesInput = document.getElementById('notes');
+        if (notesInput) notesInput.value = value || '';
+        if (window.mdEditor && typeof window.mdEditor.setMarkdown === 'function') {
+            try { window.mdEditor.setMarkdown(value || ''); } catch (_) {}
+        }
+    }
+
+    function renderChips(suggestions) {
+        var container = ensureChipContainer();
+        if (!container) return;
+        container.innerHTML = '';
+        if (!suggestions.length) return;
+        suggestions.slice(0, 8).forEach(function (text) {
+            var btn = document.createElement('button');
+            btn.type = 'button';
+            btn.className = 'px-2 py-1 rounded-md text-xs bg-background-light dark:bg-background-dark border border-border-light dark:border-border-dark text-text-light dark:text-text-dark hover:border-primary';
+            btn.textContent = text.length > 48 ? text.slice(0, 47) + '…' : text;
+            btn.title = text;
+            btn.addEventListener('click', function () { applyNotesValue(text); });
+            container.appendChild(btn);
+        });
+    }
+
+    function populateDatalist(suggestions) {
+        var notesInput = document.getElementById('notes');
+        if (!notesInput) return;
+        var datalist = ensureDatalist();
+        notesInput.setAttribute('list', 'notesSuggestions');
+        datalist.innerHTML = '';
+        suggestions.forEach(function (text) {
+            var opt = document.createElement('option');
+            opt.value = text;
+            datalist.appendChild(opt);
+        });
+    }
+
+    var loadTimer = null;
+    function scheduleLoad() {
+        if (loadTimer) clearTimeout(loadTimer);
+        loadTimer = setTimeout(loadSuggestions, 200);
+    }
+
+    function loadSuggestions() {
+        var projectId = getProjectId();
+        var url = '/api/timer/notes-suggestions' + (projectId ? ('?project_id=' + encodeURIComponent(projectId)) : '');
+        fetch(url, { credentials: 'same-origin', headers: { Accept: 'application/json' } })
+            .then(function (r) { return r.ok ? r.json() : null; })
+            .then(function (data) {
+                var suggestions = (data && data.suggestions) || [];
+                populateDatalist(suggestions);
+                renderChips(suggestions);
+            })
+            .catch(function () {});
+    }
+
+    document.addEventListener('DOMContentLoaded', function () {
+        if (!document.getElementById('notes')) return;
+        var projectSelect = document.getElementById('project_id');
+        if (projectSelect) {
+            projectSelect.addEventListener('change', scheduleLoad);
+        }
+        loadSuggestions();
+    });
+})();
diff --git a/app/static/support-ui.js b/app/static/support-ui.js
index beeda289..e20021ff 100644
--- a/app/static/support-ui.js
+++ b/app/static/support-ui.js
@@ -148,7 +148,7 @@
                     if (!data || !data.show) return;
                     var msg =
                         (cfg.i18n && cfg.i18n.longSessionToast) ||
-                        'If TimeTracker helps your day, consider supporting its development.';
+                        "You've been tracking for a while today. TimeTracker is free because of supporters like you.";
                     var act = (cfg.i18n && cfg.i18n.supportAction) || 'Support';
                     if (window.toastManager && typeof window.toastManager.show === 'function') {
                         window.toastManager.show({
diff --git a/app/templates/admin/client_portal_customization.html b/app/templates/admin/client_portal_customization.html
new file mode 100644
index 00000000..f6f23478
--- /dev/null
+++ b/app/templates/admin/client_portal_customization.html
@@ -0,0 +1,136 @@
+{% extends "base.html" %}
+{% from "components/ui.html" import page_header %}
+
+{% block title %}{{ _('Portal Customization') }} - {{ client.name }} - {{ app_name }}{% endblock %}
+
+{% block content %}
+{% set breadcrumbs = [
+    {'text': _('Clients'), 'url': url_for('clients.list_clients')},
+    {'text': client.name, 'url': url_for('clients.view_client', client_id=client.id)},
+    {'text': _('Portal Customization')}
+] %}
+
+{{ page_header(
+    icon_class='fas fa-palette',
+    title_text=_('Portal Customization'),
+    subtitle_text=client.name,
+    breadcrumbs=breadcrumbs
+) }}
+
+<div class="bg-card-light dark:bg-card-dark p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm">
+    <form method="POST" enctype="multipart/form-data" class="space-y-8">
+        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+
+        <section>
+            <h2 class="text-lg font-semibold mb-4">{{ _('Branding') }}</h2>
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                    <label for="portal_title" class="form-label">{{ _('Portal Title') }}</label>
+                    <input type="text" id="portal_title" name="portal_title" class="form-input" value="{{ customization.portal_title or '' }}">
+                </div>
+                <div>
+                    <label for="logo_url" class="form-label">{{ _('Logo URL') }}</label>
+                    <input type="url" id="logo_url" name="logo_url" class="form-input" value="{{ customization.logo_url or '' }}" placeholder="https://">
+                </div>
+                <div class="md:col-span-2">
+                    <label for="logo" class="form-label">{{ _('Upload Logo') }}</label>
+                    <input type="file" id="logo" name="logo" accept="image/*" class="form-input">
+                    {% if customization.logo_upload_path %}
+                    <p class="mt-2 text-sm text-text-muted-light dark:text-text-muted-dark">
+                        {{ _('Current upload:') }}
+                        <img src="{{ customization.logo_upload_path }}" alt="{{ _('Client logo') }}" class="inline-block h-8 ml-2 align-middle">
+                    </p>
+                    {% endif %}
+                </div>
+                <div class="md:col-span-2">
+                    <label for="portal_description" class="form-label">{{ _('Portal Description') }}</label>
+                    <textarea id="portal_description" name="portal_description" rows="2" class="form-input">{{ customization.portal_description or '' }}</textarea>
+                </div>
+                <div class="md:col-span-2">
+                    <label for="welcome_message" class="form-label">{{ _('Welcome Message') }}</label>
+                    <textarea id="welcome_message" name="welcome_message" rows="3" class="form-input">{{ customization.welcome_message or '' }}</textarea>
+                </div>
+            </div>
+        </section>
+
+        <section>
+            <h2 class="text-lg font-semibold mb-4">{{ _('Colors') }}</h2>
+            <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
+                <div>
+                    <label for="primary_color" class="form-label">{{ _('Primary Color') }}</label>
+                    <input type="color" id="primary_color" name="primary_color" class="form-input h-11" value="{{ customization.primary_color or '#4F46E5' }}">
+                </div>
+                <div>
+                    <label for="secondary_color" class="form-label">{{ _('Secondary Color') }}</label>
+                    <input type="color" id="secondary_color" name="secondary_color" class="form-input h-11" value="{{ customization.secondary_color or '#6366F1' }}">
+                </div>
+                <div>
+                    <label for="accent_color" class="form-label">{{ _('Accent Color') }}</label>
+                    <input type="color" id="accent_color" name="accent_color" class="form-input h-11" value="{{ customization.accent_color or '#14B8A6' }}">
+                </div>
+            </div>
+        </section>
+
+        <section>
+            <h2 class="text-lg font-semibold mb-4">{{ _('Typography') }}</h2>
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                    <label for="font_family" class="form-label">{{ _('Font Family') }}</label>
+                    <input type="text" id="font_family" name="font_family" class="form-input" value="{{ customization.font_family or '' }}" placeholder="Inter, sans-serif">
+                </div>
+                <div>
+                    <label for="heading_font" class="form-label">{{ _('Heading Font') }}</label>
+                    <input type="text" id="heading_font" name="heading_font" class="form-input" value="{{ customization.heading_font or '' }}" placeholder="Inter, sans-serif">
+                </div>
+            </div>
+        </section>
+
+        <section>
+            <h2 class="text-lg font-semibold mb-4">{{ _('Portal Sections') }}</h2>
+            <div class="grid grid-cols-1 sm:grid-cols-2 gap-3">
+                <label class="flex items-center gap-2">
+                    <input type="checkbox" name="show_projects" class="form-checkbox" {% if customization.show_projects %}checked{% endif %}>
+                    <span>{{ _('Show Projects') }}</span>
+                </label>
+                <label class="flex items-center gap-2">
+                    <input type="checkbox" name="show_invoices" class="form-checkbox" {% if customization.show_invoices %}checked{% endif %}>
+                    <span>{{ _('Show Invoices') }}</span>
+                </label>
+                <label class="flex items-center gap-2">
+                    <input type="checkbox" name="show_time_entries" class="form-checkbox" {% if customization.show_time_entries %}checked{% endif %}>
+                    <span>{{ _('Show Time Entries') }}</span>
+                </label>
+                <label class="flex items-center gap-2">
+                    <input type="checkbox" name="show_quotes" class="form-checkbox" {% if customization.show_quotes %}checked{% endif %}>
+                    <span>{{ _('Show Quotes') }}</span>
+                </label>
+            </div>
+        </section>
+
+        <section>
+            <h2 class="text-lg font-semibold mb-4">{{ _('Advanced') }}</h2>
+            <div class="space-y-4">
+                <div>
+                    <label for="custom_css" class="form-label">{{ _('Custom CSS') }}</label>
+                    <textarea id="custom_css" name="custom_css" rows="5" class="form-input font-mono text-sm">{{ customization.custom_css or '' }}</textarea>
+                </div>
+                <div>
+                    <label for="custom_header_html" class="form-label">{{ _('Custom Header HTML') }}</label>
+                    <textarea id="custom_header_html" name="custom_header_html" rows="3" class="form-input font-mono text-sm">{{ customization.custom_header_html or '' }}</textarea>
+                </div>
+                <div>
+                    <label for="custom_footer_html" class="form-label">{{ _('Custom Footer HTML') }}</label>
+                    <textarea id="custom_footer_html" name="custom_footer_html" rows="3" class="form-input font-mono text-sm">{{ customization.custom_footer_html or '' }}</textarea>
+                </div>
+            </div>
+        </section>
+
+        <div class="flex flex-col-reverse sm:flex-row justify-end gap-3 pt-4 border-t border-border-light dark:border-border-dark">
+            <a href="{{ url_for('clients.view_client', client_id=client.id) }}" class="px-4 py-2 rounded-lg border border-border-light dark:border-border-dark hover:bg-background-light dark:hover:bg-background-dark text-center">{{ _('Cancel') }}</a>
+            <button type="submit" class="bg-primary text-white px-6 py-2 rounded-lg hover:bg-primary-dark transition-colors">
+                <i class="fas fa-save mr-1"></i>{{ _('Save Customization') }}
+            </button>
+        </div>
+    </form>
+</div>
+{% endblock %}
diff --git a/app/templates/base.html b/app/templates/base.html
index f5119a82..15a0268c 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -70,14 +70,14 @@
                                 {{ _('Enjoying TimeTracker?') }}
                             </p>
                             <p class="text-xs text-amber-700 dark:text-amber-300" id="bannerMessage">
-                                {{ _('Support independent development — licenses are supporter badges, not paywalls.') }}
+                                {{ _('Become a Supporter or buy a coffee — every contribution helps keep TimeTracker free for everyone.') }}
                             </p>
                         </div>
                     </div>
                     <div class="flex items-center gap-2 flex-wrap">
                         <a href="{{ url_for('main.donate') }}" 
                            class="px-3 py-1.5 bg-amber-600 hover:bg-amber-700 text-white text-sm font-medium rounded-lg transition-colors">
-                            {{ _('Support / Get key') }}
+                            {{ _('Become a Supporter') }}
                         </a>
                         <a href="https://buymeacoffee.com/DryTrix?utm_source=timetracker&utm_medium=banner&utm_campaign=support" 
                            target="_blank" 
@@ -94,7 +94,7 @@
                             <i class="fab fa-paypal mr-1"></i>{{ _('PayPal') }}
                         </a>
                         <button type="button" class="text-xs text-amber-700 dark:text-amber-300 hover:underline self-center js-open-support-modal">
-                            {{ _('Support / License') }}
+                            {{ _('Support options') }}
                         </button>
                         <button onclick="dismissSupportBanner()" 
                                 class="p-1.5 text-amber-600 dark:text-amber-400 hover:bg-amber-100 dark:hover:bg-amber-900/30 rounded transition-colors"
@@ -119,6 +119,7 @@
 
         {% if current_user.is_authenticated %}
         <meta name="idle-timeout-minutes" content="{{ settings.idle_timeout_minutes if settings else 30 }}">
+        <meta name="long-entry-threshold-hours" content="8">
         {% endif %}
 
         {% if is_admin_user %}
diff --git a/app/templates/components/support_modal.html b/app/templates/components/support_modal.html
index eb07f915..7ef20beb 100644
--- a/app/templates/components/support_modal.html
+++ b/app/templates/components/support_modal.html
@@ -46,14 +46,14 @@ <h2 id="supportModalTitle" class="text-lg font-semibold">{{ _('Support TimeTrack
                 <div class="flex flex-col sm:flex-row gap-2">
                     {% if not is_license_activated %}
                     <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" data-support-tier="license" class="btn btn-primary text-center flex-1">
-                        {{ _('Buy license (€25)') }} <i class="fas fa-external-link-alt text-xs ml-1" aria-hidden="true"></i>
+                        {{ _('Become a Supporter (€25)') }} <i class="fas fa-external-link-alt text-xs ml-1" aria-hidden="true"></i>
                     </a>
                     {% endif %}
                     <button type="button" id="supportShareBtn" class="btn btn-secondary text-center flex-1">{{ _('Love TimeTracker? Share it') }}</button>
                 </div>
                 {% if not is_license_activated %}
                 <p class="text-xs text-text-muted-light dark:text-text-muted-dark">
-                    {{ _('A license is a supporter badge — it does not lock features. You keep full access either way.') }}
+                    {{ _('Becoming a Supporter is a thank-you badge — it does not lock features. Support prompts are minimized as a side effect.') }}
                 </p>
                 {% endif %}
             </div>
diff --git a/app/templates/main/dashboard.html b/app/templates/main/dashboard.html
index 078495f6..1ad14a7b 100644
--- a/app/templates/main/dashboard.html
+++ b/app/templates/main/dashboard.html
@@ -38,6 +38,18 @@
 </div>
 {% endif %}
 
+{% if overdue_invoices_summary %}
+<div class="mb-6 rounded-xl border border-red-300 dark:border-red-700 bg-red-50 dark:bg-red-900/20 p-4" role="alert">
+    <p class="font-semibold text-red-900 dark:text-red-100 mb-1">
+        <i class="fas fa-file-invoice-dollar mr-2"></i>{{ _('Overdue invoices') }}
+    </p>
+    <p class="text-sm text-red-800 dark:text-red-200 mb-2">
+        {{ _('%(count)s invoice(s) overdue — %(total)s outstanding', count=overdue_invoices_summary.count, total=overdue_invoices_summary.total|format_currency) }}
+    </p>
+    <a href="{{ overdue_invoices_summary.url }}" class="btn btn-primary btn-sm">{{ _('Review invoices') }}</a>
+</div>
+{% endif %}
+
 <!-- Workday clock-in/out (separate from project timer) -->
 <div class="{% if active_workday_session %}bg-gradient-to-br from-emerald-50 to-teal-50 dark:from-emerald-900/20 dark:to-teal-900/20 border border-emerald-200 dark:border-emerald-800{% else %}bg-card-light dark:bg-card-dark border border-border-light dark:border-border-dark{% endif %} p-6 rounded-xl shadow-sm dashboard-widget animated-card mb-6" {% if active_workday_session %}data-workday-start="{{ active_workday_session.start_time.isoformat() }}"{% endif %}>
     <div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between mb-4 min-w-0">
@@ -238,6 +250,82 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark truncate">{
     {% endif %}
 </div>
 
+{% set progress_pct = (today_seconds / daily_target_seconds * 100) if daily_target_seconds and daily_target_seconds > 0 else 0 %}
+{% set progress_pct_display = [progress_pct, 100]|min %}
+{% if progress_pct >= 100 %}
+    {% set progress_color = 'emerald' %}
+{% elif progress_pct >= 50 or not is_past_midday %}
+    {% set progress_color = 'amber' %}
+{% else %}
+    {% set progress_color = 'red' %}
+{% endif %}
+{% set today_h = today_seconds // 3600 %}
+{% set today_m = (today_seconds % 3600) // 60 %}
+
+<div class="grid grid-cols-1 lg:grid-cols-3 gap-6 mb-6">
+    <div class="lg:col-span-2 bg-card-light dark:bg-card-dark p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm dashboard-widget">
+        <div class="flex items-center justify-between gap-4 mb-4">
+            <div>
+                <h2 class="text-lg font-semibold text-text-light dark:text-text-dark">{{ _("Today's progress") }}</h2>
+                <p class="text-sm text-text-muted-light dark:text-text-muted-dark">{{ _('Track toward your daily target') }}</p>
+            </div>
+            {% if active_timer %}
+            <span class="inline-flex items-center gap-2 text-xs font-medium text-blue-600 dark:text-blue-400">
+                <span class="w-2 h-2 bg-blue-500 rounded-full animate-pulse"></span>{{ _('Timer running') }}
+            </span>
+            {% endif %}
+        </div>
+        <div class="flex items-center gap-6">
+            <div class="relative w-20 h-20 shrink-0">
+                <svg viewBox="0 0 36 36" class="w-20 h-20 -rotate-90">
+                    <circle cx="18" cy="18" r="15.9155" fill="none" class="stroke-gray-200 dark:stroke-gray-700" stroke-width="3"></circle>
+                    <circle cx="18" cy="18" r="15.9155" fill="none"
+                            class="{% if progress_color == 'emerald' %}stroke-emerald-500{% elif progress_color == 'amber' %}stroke-amber-500{% else %}stroke-red-500{% endif %}"
+                            stroke-width="3" stroke-linecap="round"
+                            stroke-dasharray="100"
+                            stroke-dashoffset="{{ 100 - progress_pct_display }}"></circle>
+                </svg>
+            </div>
+            <div class="min-w-0 flex-1">
+                <p class="text-2xl font-bold text-text-light dark:text-text-dark">
+                    {{ today_h }}h {{ '%02d'|format(today_m) }}m
+                    <span class="text-base font-medium text-text-muted-light dark:text-text-muted-dark">/ {{ '%.0f'|format(standard_hours_per_day) }}h</span>
+                </p>
+                <p class="text-sm text-text-muted-light dark:text-text-muted-dark mt-1">
+                    {{ '%.0f'|format(progress_pct) }}% {{ _('of daily target') }}
+                </p>
+                {% if week_utilization is defined %}
+                <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-2">
+                    {{ _('This week:') }} {{ '%.1f'|format(week_utilization.billable_hours or 0) }}h {{ _('billable') }} / {{ '%.1f'|format(week_utilization.total_hours or 0) }}h
+                </p>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+    {% if recent_combos %}
+    <div class="bg-card-light dark:bg-card-dark p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm dashboard-widget">
+        <h2 class="text-lg font-semibold text-text-light dark:text-text-dark mb-3">{{ _('Quick start') }}</h2>
+        <p class="text-sm text-text-muted-light dark:text-text-muted-dark mb-4">{{ _('Start the timer for a recent project') }}</p>
+        <div class="flex flex-col gap-2">
+            {% for combo in recent_combos %}
+            <form method="POST" action="{{ url_for('timer.start_timer') }}" class="inline">
+                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+                <input type="hidden" name="project_id" value="{{ combo.project_id }}">
+                {% if combo.task_id %}<input type="hidden" name="task_id" value="{{ combo.task_id }}">{% endif %}
+                <button type="submit" class="w-full text-left px-3 py-2 rounded-lg border border-border-light dark:border-border-dark hover:bg-background-light dark:hover:bg-background-dark transition-colors">
+                    <span class="font-medium text-text-light dark:text-text-dark">{{ combo.project_name }}</span>
+                    {% if combo.task_name %}
+                    <span class="text-xs text-text-muted-light dark:text-text-muted-dark block">{{ combo.task_name }}</span>
+                    {% endif %}
+                </button>
+            </form>
+            {% endfor %}
+        </div>
+    </div>
+    {% endif %}
+</div>
+
 <!-- Key Stats with Sparklines -->
 <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 mb-6">
     <!-- Today's Hours Card -->
@@ -279,6 +367,11 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark truncate">{
                     {% if week_overtime_hours > 0 %}<span class="font-medium">+ {{ "%.2f"|format(week_overtime_hours) }}h {{ _('overtime') }}</span>{% endif %}
                 </div>
                 {% endif %}
+                {% if week_utilization is defined and week_utilization.total_hours %}
+                <div class="mt-2 text-xs text-green-700 dark:text-green-300">
+                    {{ '%.1f'|format(week_utilization.billable_hours or 0) }}h {{ _('billable') }} / {{ '%.1f'|format(week_utilization.total_hours or 0) }}h {{ _('this week') }}
+                </div>
+                {% endif %}
             </div>
             <div class="bg-green-500/10 dark:bg-green-400/10 p-4 rounded-full">
                 <i class="fas fa-calendar-week text-green-600 dark:text-green-400 text-2xl"></i>
@@ -419,8 +512,67 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark">{{ _('This
 </div>
 
 <div class="grid grid-cols-1 lg:grid-cols-3 gap-6 mb-6">
-    <!-- Left Column: Recent Entries -->
-    <div class="lg:col-span-2">
+    <!-- Left Column: Quick Log + Recent Entries -->
+    <div class="lg:col-span-2 space-y-6">
+        <!-- Quick Log Time -->
+        <div class="bg-card-light dark:bg-card-dark rounded-xl shadow-lg border border-border-light dark:border-border-dark dashboard-widget animated-card">
+            <button type="button" id="quickLogToggle" class="w-full flex items-center justify-between p-4 text-left hover:bg-background-light dark:hover:bg-background-dark rounded-xl transition-colors" aria-expanded="false" aria-controls="quickLogPanel">
+                <div class="flex items-center gap-3">
+                    <div class="bg-primary/10 dark:bg-primary/20 p-3 rounded-lg">
+                        <i class="fas fa-plus-circle text-primary text-xl"></i>
+                    </div>
+                    <div>
+                        <h2 class="text-lg font-semibold text-text-light dark:text-text-dark">{{ _('Log Time') }}</h2>
+                        <p class="text-sm text-text-muted-light dark:text-text-muted-dark">{{ _('Record past hours without starting a timer') }}</p>
+                    </div>
+                </div>
+                <i class="fas fa-chevron-down text-text-muted-light dark:text-text-muted-dark transition-transform" id="quickLogChevron"></i>
+            </button>
+            <div id="quickLogPanel" class="hidden px-4 pb-4 border-t border-border-light dark:border-border-dark">
+                <form id="quickLogForm" class="pt-4 space-y-4">
+                    <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+                        <div>
+                            <label for="quickLogDuration" class="form-label">{{ _('Duration') }} *</label>
+                            <input type="text" id="quickLogDuration" name="duration" class="form-input w-full" placeholder="{{ _('e.g. 2h 30m or 2.5') }}" required autocomplete="off">
+                            <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Hours and minutes, or decimal hours') }}</p>
+                        </div>
+                        <div>
+                            <label for="quickLogDate" class="form-label">{{ _('Date') }}</label>
+                            <input type="date" id="quickLogDate" name="date" class="form-input w-full" value="{{ today_date.strftime('%Y-%m-%d') }}">
+                        </div>
+                    </div>
+                    <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+                        <div>
+                            <label for="quickLogProject" class="form-label">{{ _('Project') }} *</label>
+                            <select id="quickLogProject" name="project_id" class="form-input w-full" required>
+                                <option value="">{{ _('Select a project') }}</option>
+                                {% for project in active_projects %}
+                                <option value="{{ project.id }}">{{ project.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                        <div>
+                            <label for="quickLogTask" class="form-label">{{ _('Task (optional)') }}</label>
+                            <select id="quickLogTask" name="task_id" class="form-input w-full">
+                                <option value="">{{ _('No task') }}</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div>
+                        <label for="quickLogNotes" class="form-label">{{ _('Notes (optional)') }}</label>
+                        <textarea id="quickLogNotes" name="notes" class="form-input w-full" rows="2" placeholder="{{ _('What did you work on?') }}"></textarea>
+                    </div>
+                    <div class="flex justify-end gap-2">
+                        <button type="button" id="quickLogCancel" class="btn btn-secondary btn-sm">{{ _('Cancel') }}</button>
+                        <button type="submit" id="quickLogSubmit" class="btn btn-primary btn-sm">
+                            <i class="fas fa-save mr-1"></i>{{ _('Log Time') }}
+                        </button>
+                    </div>
+                    <p id="quickLogError" class="hidden text-sm text-red-600 dark:text-red-400"></p>
+                </form>
+            </div>
+        </div>
+
         <div class="bg-card-light dark:bg-card-dark p-6 rounded-xl shadow-lg hover:shadow-xl transition-all duration-300 dashboard-widget animated-card">
             <div class="flex items-center justify-between mb-4">
                 <div class="flex items-center gap-3">
@@ -573,6 +725,72 @@ <h3 class="text-base font-semibold text-text-light dark:text-text-dark mb-2">
             {% endif %}
         {% endif %}
 
+        <!-- Tasks Due Today -->
+        {% if is_module_enabled('tasks') and tasks_due_today %}
+        <div class="bg-card-light dark:bg-card-dark p-6 rounded-xl shadow-lg hover:shadow-xl transition-all duration-300 dashboard-widget animated-card">
+            <div class="flex items-center justify-between mb-4">
+                <div class="flex items-center gap-3">
+                    <div class="bg-amber-500/10 dark:bg-amber-400/10 p-3 rounded-lg">
+                        <i class="fas fa-tasks text-amber-600 dark:text-amber-400 text-xl"></i>
+                    </div>
+                    <h2 class="text-lg font-semibold text-text-light dark:text-text-dark">{{ _('Tasks Due Today') }}</h2>
+                </div>
+                <a href="{{ url_for('tasks.list_tasks') }}" class="text-sm font-medium text-primary hover:text-primary-dark hover:underline">{{ _('View all') }}</a>
+            </div>
+            <ul class="space-y-2" id="tasksDueTodayList">
+                {% for task in tasks_due_today %}
+                <li class="flex items-center gap-3 p-3 rounded-lg border border-border-light dark:border-border-dark hover:bg-background-light dark:hover:bg-background-dark transition-colors" data-task-id="{{ task.id }}">
+                    <input type="checkbox" class="task-due-complete w-5 h-5 rounded border-gray-300 text-primary focus:ring-primary cursor-pointer" aria-label="{{ _('Mark complete') }}: {{ task.name }}" data-task-id="{{ task.id }}">
+                    <div class="flex-1 min-w-0">
+                        <a href="{{ url_for('tasks.view_task', task_id=task.id) }}" class="font-medium text-text-light dark:text-text-dark hover:text-primary truncate block">{{ task.name }}</a>
+                        <div class="text-xs text-text-muted-light dark:text-text-muted-dark flex flex-wrap gap-2 mt-0.5">
+                            {% if task.project %}<span><i class="fas fa-folder mr-1"></i>{{ task.project.name }}</span>{% endif %}
+                            <span class="{% if task.is_overdue %}text-red-600 dark:text-red-400 font-medium{% endif %}">
+                                {% if task.is_overdue %}{{ _('Overdue') }} · {% endif %}{{ task.due_date|local_date }}
+                            </span>
+                        </div>
+                    </div>
+                </li>
+                {% endfor %}
+            </ul>
+        </div>
+        {% endif %}
+
+        <!-- Upcoming deadlines (next 7 days) -->
+        {% if is_module_enabled('tasks') and upcoming_deadlines %}
+        <div class="bg-card-light dark:bg-card-dark p-6 rounded-xl shadow-lg hover:shadow-xl transition-all duration-300 dashboard-widget animated-card">
+            <div class="flex items-center justify-between mb-4">
+                <div class="flex items-center gap-3">
+                    <div class="bg-indigo-500/10 dark:bg-indigo-400/10 p-3 rounded-lg">
+                        <i class="fas fa-calendar-day text-indigo-600 dark:text-indigo-400 text-xl"></i>
+                    </div>
+                    <h2 class="text-lg font-semibold text-text-light dark:text-text-dark">{{ _('Upcoming deadlines') }}</h2>
+                </div>
+                <span class="text-xs text-text-muted-light dark:text-text-muted-dark">{{ _('Next 7 days') }}</span>
+            </div>
+            <ul class="space-y-2">
+                {% for item in upcoming_deadlines %}
+                {% set days_left = item.due_date|days_until %}
+                <li class="flex items-center gap-3 p-3 rounded-lg border border-border-light dark:border-border-dark hover:bg-background-light dark:hover:bg-background-dark transition-colors">
+                    <span class="shrink-0 inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium
+                        {% if days_left <= 1 %}bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300
+                        {% elif days_left <= 2 %}bg-amber-100 text-amber-700 dark:bg-amber-900/30 dark:text-amber-300
+                        {% else %}bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-300{% endif %}">
+                        {{ item.due_date|relative_due_label }}
+                    </span>
+                    <div class="flex-1 min-w-0">
+                        <a href="{{ item.url }}" class="font-medium text-text-light dark:text-text-dark hover:text-primary truncate block">{{ item.name }}</a>
+                        <div class="text-xs text-text-muted-light dark:text-text-muted-dark flex flex-wrap gap-2 mt-0.5">
+                            {% if item.project_name %}<span><i class="fas fa-folder mr-1"></i>{{ item.project_name }}</span>{% endif %}
+                            <span>{% if item.kind == 'milestone' %}{{ _('Milestone') }}{% else %}{{ _('Task') }}{% endif %} · {{ item.due_date|local_date }}</span>
+                        </div>
+                    </div>
+                </li>
+                {% endfor %}
+            </ul>
+        </div>
+        {% endif %}
+
         <!-- Time by project (last 7 days) chart -->
         <div class="bg-card-light dark:bg-card-dark p-6 rounded-xl shadow-lg hover:shadow-xl transition-all duration-300 dashboard-widget animated-card">
             <div class="flex items-center justify-between mb-4">
@@ -920,6 +1138,189 @@ <h2 class="text-base font-semibold text-text-light dark:text-text-dark">{{ _('En
             });
         })();
 
+        // Quick Log Time card
+        (function initQuickLogTime() {
+            var toggle = document.getElementById('quickLogToggle');
+            var panel = document.getElementById('quickLogPanel');
+            var chevron = document.getElementById('quickLogChevron');
+            var form = document.getElementById('quickLogForm');
+            var projectSelect = document.getElementById('quickLogProject');
+            var taskSelect = document.getElementById('quickLogTask');
+            var cancelBtn = document.getElementById('quickLogCancel');
+            var errorEl = document.getElementById('quickLogError');
+            if (!toggle || !panel || !form) return;
+
+            var tasksApiTemplate = {{ url_for('api.get_project_tasks', project_id=0)|tojson }};
+
+            function setPanelOpen(open) {
+                panel.classList.toggle('hidden', !open);
+                toggle.setAttribute('aria-expanded', open ? 'true' : 'false');
+                if (chevron) chevron.classList.toggle('rotate-180', open);
+            }
+
+            toggle.addEventListener('click', function() {
+                setPanelOpen(panel.classList.contains('hidden'));
+            });
+            if (cancelBtn) {
+                cancelBtn.addEventListener('click', function() { setPanelOpen(false); });
+            }
+
+            function parseDuration(input) {
+                var raw = (input || '').trim().toLowerCase();
+                if (!raw) return null;
+                var decimal = parseFloat(raw.replace(',', '.'));
+                if (!isNaN(decimal) && /^\d+([.,]\d+)?$/.test(raw)) {
+                    return Math.round(decimal * 3600);
+                }
+                var totalSec = 0;
+                var hMatch = raw.match(/(\d+(?:[.,]\d+)?)\s*h/);
+                var mMatch = raw.match(/(\d+(?:[.,]\d+)?)\s*m/);
+                if (hMatch) totalSec += Math.round(parseFloat(hMatch[1].replace(',', '.')) * 3600);
+                if (mMatch) totalSec += Math.round(parseFloat(mMatch[1].replace(',', '.')) * 60);
+                if (!hMatch && !mMatch) {
+                    var parts = raw.split(':');
+                    if (parts.length === 2) {
+                        totalSec = (parseInt(parts[0], 10) || 0) * 3600 + (parseInt(parts[1], 10) || 0) * 60;
+                    } else if (parts.length === 3) {
+                        totalSec = (parseInt(parts[0], 10) || 0) * 3600 + (parseInt(parts[1], 10) || 0) * 60 + (parseInt(parts[2], 10) || 0);
+                    }
+                }
+                return totalSec > 0 ? totalSec : null;
+            }
+
+            async function loadTasks(projectId) {
+                if (!taskSelect) return;
+                taskSelect.innerHTML = '<option value="">{{ _("No task")|e }}</option>';
+                if (!projectId) return;
+                try {
+                    var url = tasksApiTemplate.replace('/0/', '/' + projectId + '/');
+                    var res = await fetch(url, { credentials: 'same-origin' });
+                    if (!res.ok) return;
+                    var data = await res.json();
+                    (data.tasks || []).forEach(function(task) {
+                        var opt = document.createElement('option');
+                        opt.value = task.id;
+                        opt.textContent = task.name;
+                        taskSelect.appendChild(opt);
+                    });
+                } catch (e) { /* ignore */ }
+            }
+
+            if (projectSelect) {
+                projectSelect.addEventListener('change', function() {
+                    loadTasks(this.value);
+                });
+            }
+
+            form.addEventListener('submit', async function(e) {
+                e.preventDefault();
+                if (errorEl) { errorEl.classList.add('hidden'); errorEl.textContent = ''; }
+                var durationSec = parseDuration(document.getElementById('quickLogDuration').value);
+                if (!durationSec) {
+                    if (errorEl) {
+                        errorEl.textContent = {{ _('Enter a valid duration (e.g. 2h 30m or 2.5)')|tojson }};
+                        errorEl.classList.remove('hidden');
+                    }
+                    return;
+                }
+                var dateVal = document.getElementById('quickLogDate').value;
+                var projectId = projectSelect ? projectSelect.value : '';
+                if (!projectId) {
+                    if (errorEl) {
+                        errorEl.textContent = {{ _('Please select a project')|tojson }};
+                        errorEl.classList.remove('hidden');
+                    }
+                    return;
+                }
+                var endDt = new Date(dateVal + 'T12:00:00');
+                var startDt = new Date(endDt.getTime() - durationSec * 1000);
+                var payload = {
+                    project_id: parseInt(projectId, 10),
+                    task_id: taskSelect && taskSelect.value ? parseInt(taskSelect.value, 10) : null,
+                    start_time: startDt.toISOString(),
+                    end_time: endDt.toISOString(),
+                    notes: (document.getElementById('quickLogNotes').value || '').trim() || null,
+                    billable: true
+                };
+                var submitBtn = document.getElementById('quickLogSubmit');
+                if (submitBtn) submitBtn.disabled = true;
+                try {
+                    var res = await fetch('/api/entries', {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' },
+                        credentials: 'same-origin',
+                        body: JSON.stringify(payload)
+                    });
+                    var body = await res.json().catch(function() { return {}; });
+                    if (!res.ok) {
+                        throw new Error(body.error || body.message || 'Request failed');
+                    }
+                    if (window.toastManager && window.toastManager.success) {
+                        window.toastManager.success({{ _('Time logged successfully')|tojson }}, '', 3000);
+                    }
+                    form.reset();
+                    if (document.getElementById('quickLogDate')) {
+                        document.getElementById('quickLogDate').value = dateVal;
+                    }
+                    setPanelOpen(false);
+                    window.location.reload();
+                } catch (err) {
+                    if (errorEl) {
+                        errorEl.textContent = err.message || {{ _('Could not log time')|tojson }};
+                        errorEl.classList.remove('hidden');
+                    }
+                } finally {
+                    if (submitBtn) submitBtn.disabled = false;
+                }
+            });
+        })();
+
+        // Tasks due today: inline complete
+        (function initTasksDueToday() {
+            document.querySelectorAll('.task-due-complete').forEach(function(checkbox) {
+                checkbox.addEventListener('change', async function() {
+                    if (!this.checked) return;
+                    var taskId = this.getAttribute('data-task-id');
+                    var row = this.closest('[data-task-id]');
+                    this.disabled = true;
+                    try {
+                        var res = await fetch('/api/tasks/' + taskId + '/status', {
+                            method: 'PUT',
+                            headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' },
+                            credentials: 'same-origin',
+                            body: JSON.stringify({ status: 'done' })
+                        });
+                        if (!res.ok) throw new Error('Failed');
+                        if (row) {
+                            row.style.opacity = '0.5';
+                            row.querySelector('a').classList.add('line-through');
+                        }
+                        if (window.toastManager && window.toastManager.success) {
+                            window.toastManager.success({{ _('Task completed')|tojson }}, '', 2000);
+                        }
+                    } catch (e) {
+                        this.checked = false;
+                        this.disabled = false;
+                        if (window.toastManager && window.toastManager.error) {
+                            window.toastManager.error({{ _('Could not complete task')|tojson }}, '', 3000);
+                        }
+                    }
+                });
+            });
+        })();
+
+        // Soft refresh dashboard timer hero when timer stops externally (idle detection, floating bar)
+        document.addEventListener('tt:timer-status-changed', async function() {
+            try {
+                var res = await fetch('/timer/status', { credentials: 'same-origin' });
+                var data = await res.json();
+                var hero = document.querySelector('[data-timer-start]');
+                if (!data.active && hero) {
+                    window.location.reload();
+                }
+            } catch (e) { /* ignore */ }
+        });
+
         // Live timer: update elapsed every second when a timer is running; also live Today/Week/Month hours
         (function initLiveTimer() {
             var timerWidget = document.querySelector('[data-timer-start]');
diff --git a/app/templates/main/donate.html b/app/templates/main/donate.html
index e942ff96..03ffb73e 100644
--- a/app/templates/main/donate.html
+++ b/app/templates/main/donate.html
@@ -17,7 +17,7 @@
             <h1 class="text-2xl sm:text-4xl font-bold mb-4">{{ _('Support TimeTracker Development') }}</h1>
             <p class="text-xl opacity-90 mb-6">
                 {% if (support_ab_variant|default('control')) == 'cta_alt' %}
-                {{ _('Donate to support development — or get a key to remove prompts') }}
+                {{ _('Donate to support development — or become a Supporter to show your badge') }}
                 {% else %}
                 {{ _('Support updates and keep TimeTracker free for everyone') }}
                 {% endif %}
@@ -26,7 +26,7 @@ <h1 class="text-2xl sm:text-4xl font-bold mb-4">{{ _('Support TimeTracker Develo
                 {% if (support_ab_variant|default('control')) == 'key_first' %}
                 <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" onclick="trackDonationClick('donate_page_key')"
                    class="px-6 py-3 bg-white text-amber-600 rounded-lg font-semibold hover:bg-amber-50 transition-all shadow-lg hover:shadow-xl transform hover:-translate-y-0.5">
-                    <i class="fas fa-key mr-2"></i>{{ _('Remove prompts with key') }}
+                    <i class="fas fa-star mr-2"></i>{{ _('Become a Supporter') }}
                     <i class="fas fa-external-link-alt ml-2 text-xs"></i>
                 </a>
                 <a href="https://buymeacoffee.com/DryTrix?utm_source=timetracker&utm_medium=donate_page_hero&utm_campaign=support" target="_blank" rel="noopener noreferrer" onclick="trackDonationClick('donate_page_hero')"
@@ -46,8 +46,27 @@ <h1 class="text-2xl sm:text-4xl font-bold mb-4">{{ _('Support TimeTracker Develo
                 {% endif %}
             </div>
             <p class="mt-4 text-sm opacity-80">
-                {{ _('Remove prompts with a one-time key.') }}
-                <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" onclick="trackDonationClick('donate_page_key')" class="underline hover:no-underline">{{ _('Get key') }}</a>
+                {{ _('Supporters get a visible badge and fewer prompts — no features are locked.') }}
+                <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" onclick="trackDonationClick('donate_page_key')" class="underline hover:no-underline">{{ _('Become a Supporter') }}</a>
+            </p>
+        </div>
+    </div>
+
+    <!-- A note from the developer -->
+    <div class="bg-card-light dark:bg-card-dark p-4 sm:p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm mb-6">
+        <h2 class="text-xl sm:text-2xl font-semibold mb-4">
+            <i class="fas fa-pen-nib text-primary mr-2"></i>
+            {{ _('A note from the developer') }}
+        </h2>
+        <div class="space-y-4 text-text-light dark:text-text-dark">
+            <p>
+                {{ _('I built TimeTracker because I needed simple, reliable time tracking for my own work — without subscriptions, vendor lock-in, or features hidden behind a paywall.') }}
+            </p>
+            <p>
+                {{ _('Keeping it running means real costs: hosting, databases, domains, and the time to fix bugs, ship improvements, and answer community questions. When you donate or become a Supporter, that money goes directly toward those costs — not a corporation, just one independent developer trying to build something useful.') }}
+            </p>
+            <p class="text-text-muted-light dark:text-text-muted-dark">
+                {{ _('Thank you for using TimeTracker. Whether you contribute financially, star the repo, or spread the word — it genuinely helps.') }}
             </p>
         </div>
     </div>
@@ -56,50 +75,50 @@ <h1 class="text-2xl sm:text-4xl font-bold mb-4">{{ _('Support TimeTracker Develo
     <div class="bg-card-light dark:bg-card-dark p-4 sm:p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm mb-6">
         <h2 class="text-xl sm:text-2xl font-semibold mb-4">
             <i class="fas fa-heart text-rose-500 mr-2"></i>
-            {{ _('Why Your Support Matters') }}
+            {{ _('Where your support goes') }}
         </h2>
         <div class="space-y-4 text-text-light dark:text-text-dark">
             <p class="text-lg">
-                {{ _('TimeTracker is a free, open-source project built with passion and dedication. Your donations directly support:') }}
+                {{ _('Real numbers — every contribution, no matter the size, makes a difference:') }}
             </p>
             
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mt-6">
                 <div class="flex items-start gap-3">
-                    <i class="fas fa-server text-primary mt-1"></i>
+                    <i class="fas fa-mug-saucer text-amber-500 mt-1"></i>
                     <div>
-                        <h3 class="font-semibold mb-1">{{ _('Server Infrastructure') }}</h3>
+                        <h3 class="font-semibold mb-1">{{ _('€5 — a coffee') }}</h3>
                         <p class="text-sm text-text-muted-light dark:text-text-muted-dark">
-                            {{ _('Hosting, databases, and CDN costs to keep TimeTracker fast and reliable') }}
+                            {{ _('Covers roughly a month of basic hosting for the project website and documentation') }}
                         </p>
                     </div>
                 </div>
                 
                 <div class="flex items-start gap-3">
-                    <i class="fas fa-code text-primary mt-1"></i>
+                    <i class="fas fa-server text-primary mt-1"></i>
                     <div>
-                        <h3 class="font-semibold mb-1">{{ _('Feature Development') }}</h3>
+                        <h3 class="font-semibold mb-1">{{ _('€10 — infrastructure') }}</h3>
                         <p class="text-sm text-text-muted-light dark:text-text-muted-dark">
-                            {{ _('New features, improvements, and bug fixes based on your feedback') }}
+                            {{ _('Helps pay for server resources, CDN, and database costs that keep releases and downloads available') }}
                         </p>
                     </div>
                 </div>
                 
                 <div class="flex items-start gap-3">
-                    <i class="fas fa-shield-alt text-primary mt-1"></i>
+                    <i class="fas fa-star text-emerald-500 mt-1"></i>
                     <div>
-                        <h3 class="font-semibold mb-1">{{ _('Security & Maintenance') }}</h3>
+                        <h3 class="font-semibold mb-1">{{ _('€25 — become a Supporter') }}</h3>
                         <p class="text-sm text-text-muted-light dark:text-text-muted-dark">
-                            {{ _('Regular security updates, dependency maintenance, and performance optimization') }}
+                            {{ _('Covers about a quarter of server and domain costs, plus shows a Supporter badge in the app — no features locked') }}
                         </p>
                     </div>
                 </div>
                 
                 <div class="flex items-start gap-3">
-                    <i class="fas fa-globe text-primary mt-1"></i>
+                    <i class="fas fa-code text-primary mt-1"></i>
                     <div>
-                        <h3 class="font-semibold mb-1">{{ _('Internationalization') }}</h3>
+                        <h3 class="font-semibold mb-1">{{ _('Any amount — development time') }}</h3>
                         <p class="text-sm text-text-muted-light dark:text-text-muted-dark">
-                            {{ _('Translation support, localization, and making TimeTracker accessible worldwide') }}
+                            {{ _('Funds bug fixes, new features, translations, and keeping TimeTracker free for everyone') }}
                         </p>
                     </div>
                 </div>
@@ -107,14 +126,14 @@ <h3 class="font-semibold mb-1">{{ _('Internationalization') }}</h3>
         </div>
     </div>
 
-    <!-- Remove prompts with key: 3-step flow -->
+    <!-- Become a Supporter: 3-step flow -->
     <div class="bg-card-light dark:bg-card-dark p-4 sm:p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm mb-6 border-l-4 border-l-blue-500">
         <h2 class="text-xl sm:text-2xl font-semibold mb-4">
-            <i class="fas fa-key text-blue-500 mr-2"></i>
-            {{ _('Remove prompts with key') }}
+            <i class="fas fa-star text-blue-500 mr-2"></i>
+            {{ _('Become a Supporter') }}
         </h2>
         <p class="mb-4 text-text-light dark:text-text-dark">
-            {{ _('One key per instance; key sent by email after payment (€25 one-time). No subscription.') }}
+            {{ _('One-time €25 contribution per instance. You receive a key by email. Supporters get a visible badge; support prompts are minimized as a side effect. No subscription.') }}
         </p>
         <ol class="list-decimal list-inside space-y-3 mb-6 text-text-light dark:text-text-dark">
             <li class="flex items-start gap-2">
@@ -135,7 +154,7 @@ <h2 class="text-xl sm:text-2xl font-semibold mb-4">
            rel="noopener noreferrer"
            onclick="trackDonationClick('donate_page_key')"
            class="inline-flex items-center justify-center gap-2 px-6 py-3 bg-blue-600 hover:bg-blue-700 text-white rounded-lg font-semibold transition-all shadow-md hover:shadow-lg">
-            <i class="fas fa-key mr-2"></i>{{ _('Get key') }}
+            <i class="fas fa-star mr-2"></i>{{ _('Support TimeTracker (€25)') }}
             <i class="fas fa-external-link-alt text-sm"></i>
         </a>
     </div>
@@ -241,6 +260,19 @@ <h2 class="text-xl sm:text-2xl font-semibold mb-4">
             {{ _('Other Ways to Help') }}
         </h2>
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <a href="https://github.com/drytrix/TimeTracker" 
+               target="_blank" 
+               rel="noopener noreferrer"
+               class="flex items-center gap-3 p-4 bg-background-light dark:bg-background-dark rounded-lg hover:bg-background-hover-light dark:hover:bg-background-hover-dark transition-colors">
+                <i class="fab fa-github text-2xl text-text-light dark:text-text-dark"></i>
+                <div>
+                    <div class="font-semibold">{{ _('Star on GitHub') }}</div>
+                    <div class="text-sm text-text-muted-light dark:text-text-muted-dark">
+                        {{ _('Free way to help — stars increase visibility and bring more users to the project') }}
+                    </div>
+                </div>
+            </a>
+
             <a href="https://github.com/drytrix/TimeTracker" 
                target="_blank" 
                rel="noopener noreferrer"
@@ -270,11 +302,11 @@ <h2 class="text-xl sm:text-2xl font-semibold mb-4">
                rel="noopener noreferrer"
                onclick="trackDonationClick('donate_page_key')"
                class="flex items-center gap-3 p-4 bg-background-light dark:bg-background-dark rounded-lg hover:bg-background-hover-light dark:hover:bg-background-hover-dark transition-colors">
-                <i class="fas fa-key text-2xl text-text-light dark:text-text-dark"></i>
+                <i class="fas fa-star text-2xl text-amber-500"></i>
                 <div>
-                    <div class="font-semibold">{{ _('Remove prompts with key') }}</div>
+                    <div class="font-semibold">{{ _('Become a Supporter') }}</div>
                     <div class="text-sm text-text-muted-light dark:text-text-muted-dark">
-                        {{ _('One-time key per instance; no subscription') }}
+                        {{ _('One-time €25 — visible badge, fewer prompts, no subscription') }}
                     </div>
                 </div>
             </a>
diff --git a/app/templates/main/productivity_dashboard.html b/app/templates/main/productivity_dashboard.html
index 1f294875..8c275649 100644
--- a/app/templates/main/productivity_dashboard.html
+++ b/app/templates/main/productivity_dashboard.html
@@ -132,6 +132,20 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark">{{ _('Dail
         <p id="productivityDailyEmpty" class="hidden text-center text-sm text-text-muted-light dark:text-text-muted-dark mt-3">{{ _('No time tracked in the last 14 days.') }}</p>
     </div>
 
+    {# ---------- Row 2b — Daily breakdown by project (stacked) ---------- #}
+    <div class="bg-card-light dark:bg-card-dark p-5 rounded-xl border border-border-light dark:border-border-dark shadow-sm">
+        <div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-2 mb-4">
+            <div>
+                <h2 class="text-lg font-semibold text-text-light dark:text-text-dark">{{ _('Daily breakdown by project') }}</h2>
+                <p class="text-xs text-text-muted-light dark:text-text-muted-dark">{{ _('Last 14 days — where your time went each day') }}</p>
+            </div>
+        </div>
+        <div style="height: 240px;">
+            <canvas id="productivityDailyProjectChart" aria-label="{{ _('Daily project breakdown chart') }}"></canvas>
+        </div>
+        <p id="productivityDailyProjectEmpty" class="hidden text-center text-sm text-text-muted-light dark:text-text-muted-dark mt-3">{{ _('No time tracked in the last 14 days.') }}</p>
+    </div>
+
     {# ---------- Row 3 — projects + focus ---------- #}
     <div class="grid grid-cols-1 lg:grid-cols-5 gap-4">
         {# Project breakdown doughnut (60%) #}
@@ -242,6 +256,7 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark mb-2">{{ _(
 {{ {
     'summary': summary,
     'daily_breakdown': daily_breakdown,
+    'daily_project_breakdown': daily_project_breakdown,
     'streak': streak,
     'focus': focus,
     'projects': projects,
@@ -269,6 +284,7 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark mb-2">{{ _(
     var state = {
         data: null,
         dailyChart: null,
+        dailyProjectChart: null,
         projectChart: null,
         sparkChart: null,
         refreshTimer: null,
@@ -292,6 +308,12 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark mb-2">{{ _(
         return h.toFixed(2).replace(/\.?0+$/, '') + 'h';
     }
 
+    function addClasses(el, classNames) {
+        (classNames || '').split(/\s+/).filter(Boolean).forEach(function (cls) {
+            el.classList.add(cls);
+        });
+    }
+
     function fmtMinutes(mins) {
         mins = Math.max(0, Math.round(Number(mins) || 0));
         if (mins < 60) { return mins + 'm'; }
@@ -415,6 +437,88 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark mb-2">{{ _(
         state.dailyChart._tooltipMeta = { dates: dates, billable: billable, counts: counts };
     }
 
+    // --------------- Chart 1b: Daily stacked bars by project ---------------
+    function renderDailyProjectStackedChart() {
+        var breakdown = (state.data && state.data.daily_project_breakdown) || {};
+        var dates = breakdown.dates || [];
+        var projects = breakdown.projects || [];
+        var hoursByDay = breakdown.hours_by_day_project || {};
+        var ctxEl = document.getElementById('productivityDailyProjectChart');
+        var emptyEl = document.getElementById('productivityDailyProjectEmpty');
+        if (!ctxEl) { return; }
+
+        var labels = dates.map(fmtDateLabel);
+        var datasets = projects.map(function (p) {
+            var pid = String(p.id == null ? 0 : p.id);
+            return {
+                label: p.name,
+                data: dates.map(function (day) {
+                    var dayMap = hoursByDay[day] || {};
+                    return Number(dayMap[pid] || 0);
+                }),
+                backgroundColor: p.color || '#3b82f6',
+                borderRadius: 4,
+                borderSkipped: false,
+                stack: 'daily',
+            };
+        });
+
+        var hasData = datasets.some(function (ds) {
+            return (ds.data || []).some(function (v) { return v > 0; });
+        });
+        if (emptyEl) { emptyEl.classList.toggle('hidden', hasData); }
+
+        if (state.dailyProjectChart) {
+            state.dailyProjectChart.data.labels = labels;
+            state.dailyProjectChart.data.datasets = datasets;
+            state.dailyProjectChart.update();
+            return;
+        }
+
+        var ctx = ctxEl.getContext('2d');
+        state.dailyProjectChart = new Chart(ctx, {
+            type: 'bar',
+            data: { labels: labels, datasets: datasets },
+            options: {
+                responsive: true,
+                maintainAspectRatio: false,
+                plugins: {
+                    legend: {
+                        display: projects.length > 0,
+                        position: 'bottom',
+                        labels: { color: tickColor(), boxWidth: 12 },
+                    },
+                    tooltip: {
+                        callbacks: {
+                            title: function (items) {
+                                if (!items.length) { return ''; }
+                                var idx = items[0].dataIndex;
+                                return dates[idx] ? fmtFullDate(dates[idx]) : items[0].label;
+                            },
+                            label: function (item) {
+                                if (!item.parsed.y) { return null; }
+                                return item.dataset.label + ': ' + fmtHours(item.parsed.y);
+                            },
+                        },
+                    },
+                },
+                scales: {
+                    x: {
+                        stacked: true,
+                        grid: { color: gridColor() },
+                        ticks: { color: tickColor() },
+                    },
+                    y: {
+                        stacked: true,
+                        beginAtZero: true,
+                        grid: { color: gridColor() },
+                        ticks: { color: tickColor() },
+                    },
+                },
+            },
+        });
+    }
+
     // --------------- Chart 2: Project doughnut ---------------
     function renderProjectChart() {
         var projects = (state.data && state.data.projects) || [];
@@ -641,10 +745,10 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark mb-2">{{ _(
                 cell.style.height = '12px';
                 if (!entry) {
                     cell.classList.add('opacity-30');
-                    cell.classList.add(cellClasses[0]);
+                    addClasses(cell, cellClasses[0]);
                 } else {
                     var lvl = Math.max(0, Math.min(4, entry.level || 0));
-                    cell.classList.add(cellClasses[lvl]);
+                    addClasses(cell, cellClasses[lvl]);
                     cell.title = entry.date + ': ' + fmtHours(entry.hours);
                 }
                 colWrap.appendChild(cell);
@@ -768,6 +872,7 @@ <h2 class="text-lg font-semibold text-text-light dark:text-text-dark mb-2">{{ _(
         renderSummary();
         renderInsights();
         renderDailyChart();
+        renderDailyProjectStackedChart();
         renderProjectChart();
         renderSparkline();
         renderHeatmap();
diff --git a/app/templates/partials/_bottom_nav.html b/app/templates/partials/_bottom_nav.html
index 421fa014..cf27c259 100644
--- a/app/templates/partials/_bottom_nav.html
+++ b/app/templates/partials/_bottom_nav.html
@@ -2,7 +2,7 @@
 {% set ep = request.endpoint or '' %}
 {% set timer_tab_active = ep.startswith('timer.') and ep != 'timer.time_entries_overview' %}
 {% set reports_in_more = ep.startswith('reports.') and not ep.startswith('scheduled_reports.') and not ep.startswith('custom_reports.') %}
-{% set more_tab_active = ep.startswith('invoices.') or ep.startswith('clients.') or reports_in_more or ep.startswith('user.settings') %}
+{% set more_tab_active = ep.startswith('invoices.') or ep.startswith('clients.') or ep.startswith('tasks.') or ep.startswith('expenses.') or ep.startswith('deals.') or ep.startswith('leads.') or reports_in_more or ep.startswith('user.settings') or ep.startswith('admin.users') or ep == 'main.productivity_dashboard' or ep.startswith('calendar.') or ep.startswith('recurring_tasks.') %}
 {# Backdrop + drawer sit above the tab bar so taps dismiss correctly #}
 <div id="bottomNavMoreBackdrop" class="hidden fixed inset-0 z-[55] bg-black/40 md:hidden" aria-hidden="true"></div>
 <section
@@ -22,6 +22,68 @@ <h2 id="bottomNavMoreTitle" class="text-base font-semibold text-text-light dark:
         </button>
     </div>
     <nav class="overflow-y-auto px-3 py-3 space-y-1" aria-label="{{ _('More navigation') }}">
+        <a href="{{ url_for('main.productivity_dashboard') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep == 'main.productivity_dashboard' %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
+            <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 13.125C3 12.504 3.504 12 4.125 12h2.25c.621 0 1.125.504 1.125 1.125v6.75C7.5 20.496 6.996 21 6.375 21h-2.25A1.125 1.125 0 0 1 3 19.875v-6.75ZM9.75 8.625c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125v11.25c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V8.625ZM16.5 4.125c0-.621.504-1.125 1.125-1.125h2.25C20.496 3 21 3.504 21 4.125v15.75c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V4.125Z" />
+            </svg>
+            <span>{{ _('My productivity') }}</span>
+        </a>
+        {% if is_module_enabled('calendar') %}
+        <a href="{{ url_for('calendar.view_calendar') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep.startswith('calendar.') %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
+            <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 0 1 2.25-2.25h13.5A2.25 2.25 0 0 1 21 7.5v11.25m-18 0A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75m-18 0v-7.5A2.25 2.25 0 0 1 5.25 9h13.5A2.25 2.25 0 0 1 21 11.25v7.5" />
+            </svg>
+            <span>{{ _('Calendar') }}</span>
+        </a>
+        {% endif %}
+        {% if is_module_enabled('recurring_tasks') and current_user.ui_show_recurring_tasks %}
+        <a href="{{ url_for('recurring_tasks.list_recurring_tasks') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep.startswith('recurring_tasks.') %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
+            <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182M2.985 19.644l3.181-3.182" />
+            </svg>
+            <span>{{ _('Recurring Tasks') }}</span>
+        </a>
+        {% endif %}
+        {% if is_module_enabled('tasks') %}
+        <a href="{{ url_for('tasks.list_tasks') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep.startswith('tasks.') %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
+            <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h3.75M9 15h3.75M9 18h3.75m3 .75H18a2.25 2.25 0 0 0 2.25-2.25V6.108c0-1.135-.845-2.098-1.976-2.192a48.424 48.424 0 0 0-1.123-.08m-5.801 0c-.065.21-.1.433-.1.664 0 .414.336.75.75.75h4.5a.75.75 0 0 0 .75-.75 2.25 2.25 0 0 0-.1-.664m-5.8 0A2.251 2.251 0 0 1 13.5 2.25H15a2.25 2.25 0 0 1 2.15 1.586m-5.8 0c-.376.023-.75.05-1.124.08C9.095 4.01 8.25 4.973 8.25 6.108V8.25m0 0H4.875c-.621 0-1.125.504-1.125 1.125v11.25c0 .621.504 1.125 1.125 1.125h9.75c.621 0 1.125-.504 1.125-1.125V9.375c0-.621-.504-1.125-1.125-1.125H8.25ZM6.75 12h.008v.008H6.75V12Zm0 3h.008v.008H6.75V15Zm0 3h.008v.008H6.75V18Z" />
+            </svg>
+            <span>{{ _('Tasks') }}</span>
+        </a>
+        {% endif %}
+        {% if is_module_enabled('expenses') %}
+        <a href="{{ url_for('expenses.list_expenses') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep.startswith('expenses.') %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
+            <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v1.5m0-1.5h1.5m-1.5 0h.375" />
+            </svg>
+            <span>{{ _('Expenses') }}</span>
+        </a>
+        {% endif %}
+        {% if is_module_enabled('deals') %}
+        <a href="{{ url_for('deals.list_deals') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep.startswith('deals.') %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
+            <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20.25 14.15v4.25c0 1.094-.787 2.036-1.872 2.18-2.087.277-4.216.42-6.378.42s-4.291-.143-6.378-.42c-1.085-.144-1.872-1.086-1.872-2.18v-4.25m16.5 0a2.18 2.18 0 0 0 .75-1.661V8.706c0-1.081-.768-2.015-1.837-2.175a48.114 48.114 0 0 0-3.413-.387m4.5 8.006c-.194.165-.42.295-.673.379A18.922 18.922 0 0 1 12 15c-2.648 0-5.195-.429-7.577-1.22a2.016 2.016 0 0 1-.673-.379m0 0A2.18 2.18 0 0 1 3 12.489V8.706c0-1.081.768-2.015 1.837-2.175a48.111 48.111 0 0 1 3.413-.387m7.5 0V5.25A2.25 2.25 0 0 0 13.5 3h-3a2.25 2.25 0 0 0-2.25 2.25v.894m7.5 0a48.667 48.667 0 0 0-7.5 0M12 12.75h.008v.008H12v-.008Z" />
+            </svg>
+            <span>{{ _('Deals') }}</span>
+        </a>
+        {% endif %}
+        {% if is_module_enabled('leads') %}
+        <a href="{{ url_for('leads.list_leads') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep.startswith('leads.') %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
+            <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19.128a9.38 9.38 0 0 0 2.625.372 9.337 9.337 0 0 0 4.121-.952 4.125 4.125 0 0 0-7.433-2.582M15 19.128v-.003c0-1.113-.285-2.16-.786-3.07M15 19.128v.106A12.318 12.318 0 0 1 8.624 21c-2.331 0-4.512-.645-6.374-1.766l-.001-.109a6.375 6.375 0 0 1 11.964-3.07M12 6.375a3.375 3.375 0 1 1-6.75 0 3.375 3.375 0 0 1 6.75 0Zm8.25 2.25a2.625 2.625 0 1 1-5.25 0 2.625 2.625 0 0 1 5.25 0Z" />
+            </svg>
+            <span>{{ _('Leads') }}</span>
+        </a>
+        {% endif %}
+        {% if current_user.is_admin %}
+        <a href="{{ url_for('admin.list_users') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep.startswith('admin.users') %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
+            <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
+            </svg>
+            <span>{{ _('Users') }}</span>
+        </a>
+        {% endif %}
         {% if is_module_enabled('invoices') %}
         <a href="{{ url_for('invoices.list_invoices') }}" class="bottom-nav-more-link flex items-center gap-3 min-h-[44px] px-3 rounded-xl text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark {% if ep.startswith('invoices.') %}text-primary font-semibold bg-primary/5 dark:bg-primary/10{% endif %}">
             <svg class="w-6 h-6 shrink-0 text-current opacity-80" fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
diff --git a/app/templates/partials/_sidebar.html b/app/templates/partials/_sidebar.html
index 17013500..7e4069be 100644
--- a/app/templates/partials/_sidebar.html
+++ b/app/templates/partials/_sidebar.html
@@ -10,9 +10,9 @@ <h1 class="text-2xl font-bold text-primary sidebar-header-title min-w-0"><a href
             </div>
             <nav class="flex-1">
                 {% set ep = request.endpoint or '' %}
-                {% set work_open = (ep.startswith('projects.') or ep.startswith('tasks.') or ep.startswith('issues.') or ep.startswith('timer.') or ep.startswith('time_approvals.') or ep.startswith('workday.') or ep.startswith('workflows.') or ep.startswith('kanban.') or ep.startswith('weekly_goals.') or ep.startswith('project_templates.') or ep.startswith('gantt.') or ep.startswith('workforce.') or ep.startswith('milestones.') or ep.startswith('resource_scheduling.')) and ep != 'timer.manual_entry' and ep != 'timer.time_entries_overview' %}
+                {% set work_open = (ep.startswith('projects.') or ep.startswith('tasks.') or ep.startswith('issues.') or ep.startswith('timer.') or ep.startswith('time_approvals.') or ep.startswith('workday.') or ep.startswith('workflows.') or ep.startswith('recurring_tasks.') or ep.startswith('kanban.') or ep.startswith('weekly_goals.') or ep.startswith('project_templates.') or ep.startswith('gantt.') or ep.startswith('workforce.') or ep.startswith('milestones.') or ep.startswith('resource_scheduling.')) and ep != 'timer.manual_entry' and ep != 'timer.time_entries_overview' %}
                 {% set calendar_open = ep.startswith('calendar.') %}
-                {% set finance_open = ep.startswith('reports.') or ep.startswith('invoices.') or ep.startswith('recurring_invoices.') or ep.startswith('payments.') or ep.startswith('expenses.') or ep.startswith('mileage.') or ep.startswith('per_diem.') or ep.startswith('budget_alerts.') or ep.startswith('invoice_approvals.') or ep.startswith('payment_gateways.') or ep.startswith('scheduled_reports.') or ep.startswith('custom_reports.') %}
+                {% set finance_open = ep.startswith('invoices.') or ep.startswith('recurring_invoices.') or ep.startswith('payments.') or ep.startswith('expenses.') or ep.startswith('mileage.') or ep.startswith('per_diem.') or ep.startswith('budget_alerts.') or ep.startswith('invoice_approvals.') or ep.startswith('payment_gateways.') or ep.startswith('scheduled_reports.') or ep.startswith('custom_reports.') %}
                 {% set crm_open = ep.startswith('clients.') or ep.startswith('quotes.') or ep.startswith('contacts.') or ep.startswith('deals.') or ep.startswith('leads.') %}
                 {% set inventory_open = ep.startswith('inventory.') %}
                 {% set analytics_open = ep.startswith('analytics.') %}
@@ -100,9 +100,9 @@ <h1 class="text-2xl font-bold text-primary sidebar-header-title min-w-0"><a href
                     </li>
                     {% endif %}
                     <li class="mt-3 pt-3 border-t border-border-light dark:border-border-dark">
-                        <button data-dropdown="workDropdown" class="sidebar-nav-item w-full flex items-center p-2 rounded-lg border-l-4 {% if work_open %}border-primary bg-primary/5 dark:bg-primary/10 text-primary font-semibold{% else %}border-transparent text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" title="{{ _('Time Tracking') }}">
+                        <button data-dropdown="workDropdown" class="sidebar-nav-item w-full flex items-center p-2 rounded-lg border-l-4 {% if work_open %}border-primary bg-primary/5 dark:bg-primary/10 text-primary font-semibold{% else %}border-transparent text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" title="{{ _('Projects & Work') }}">
                             <i class="fas fa-briefcase w-6 text-center"></i>
-                            <span class="ml-3 sidebar-label">{{ _('Time Tracking') }}</span>
+                            <span class="ml-3 sidebar-label">{{ _('Projects & Work') }}</span>
                             <i class="fas fa-chevron-down ml-auto sidebar-label"></i>
                         </button>
                 <ul id="workDropdown" class="{% if not work_open %}hidden {% endif %}mt-2 space-y-2 ml-6">
@@ -118,6 +118,7 @@ <h1 class="text-2xl font-bold text-primary sidebar-header-title min-w-0"><a href
                             {% set nav_active_kanban = ep.startswith('kanban.') %}
                             {% set nav_active_templates = ep.startswith('time_entry_templates.') %}
                             {% set nav_active_workflows = ep.startswith('workflows.') %}
+                            {% set nav_active_recurring_tasks = ep.startswith('recurring_tasks.') %}
                             {% set nav_active_goals = ep.startswith('weekly_goals.') %}
                             {% set nav_active_project_templates = ep.startswith('project_templates.') %}
                             {% set nav_active_workforce = ep.startswith('workforce.') %}
@@ -204,6 +205,13 @@ <h1 class="text-2xl font-bold text-primary sidebar-header-title min-w-0"><a href
                                 </a>
                             </li>
                             {% endif %}
+                            {% if is_module_enabled('recurring_tasks') and current_user.ui_show_recurring_tasks %}
+                            <li>
+                                <a class="block px-2 py-1 rounded {% if nav_active_recurring_tasks %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" href="{{ url_for('recurring_tasks.list_recurring_tasks') }}">
+                                    <i class="fas fa-redo w-4 mr-2"></i>{{ _('Recurring Tasks') }}
+                                </a>
+                            </li>
+                            {% endif %}
                         </ul>
                     </li>
                     {% if has_enabled_modules(ModuleCategory.CRM) %}
@@ -282,41 +290,23 @@ <h1 class="text-2xl font-bold text-primary sidebar-header-title min-w-0"><a href
                             {% set nav_active_mileage = ep.startswith('mileage.') %}
                             {% set nav_active_perdiem = ep.startswith('per_diem.') and not ep.startswith('per_diem.list_rates') %}
                             {% set nav_active_budget = ep.startswith('budget_alerts.') %}
-                            {% set reports_open = ep.startswith('reports.') or ep.startswith('scheduled_reports.') or ep.startswith('custom_reports.') %}
-                            {% if is_module_enabled('reports') %}
+                            {% if is_module_enabled('custom_reports') %}
                             <li>
-                                <button data-dropdown="reportsDropdown" class="w-full flex items-center px-2 py-1 rounded {% if reports_open %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}">
-                                    <i class="fas fa-chart-bar w-4 mr-2"></i>
-                                    <span class="flex-1 text-left">{{ _('Reports') }}</span>
-                                    <i class="fas fa-chevron-down text-xs"></i>
-                                </button>
-                                <ul id="reportsDropdown" class="{% if not reports_open %}hidden {% endif %}mt-2 space-y-2 ml-6">
-                                    {% set nav_active_reports = ep.startswith('reports.') and not ep.startswith('scheduled_reports.') and not ep.startswith('custom_reports.') %}
-                                    <li>
-                                        <a data-no-propagation="true" class="block px-2 py-1 rounded {% if nav_active_reports %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" href="{{ url_for('reports.reports') }}">
-                                            <i class="fas fa-chart-line w-4 mr-2"></i>{{ _('All Reports') }}
-                                        </a>
-                                    </li>
-                                    {% if is_module_enabled('custom_reports') %}
-                                    <li>
-                                        <a data-no-propagation="true" class="block px-2 py-1 rounded {% if ep == 'custom_reports.report_builder' or ep == 'custom_reports.view_custom_report' %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" href="{{ url_for('custom_reports.report_builder') }}">
-                                            <i class="fas fa-magic w-4 mr-2"></i>{{ _('Report Builder') }}
-                                        </a>
-                                    </li>
-                                    <li>
-                                        <a data-no-propagation="true" class="block px-2 py-1 rounded {% if ep == 'custom_reports.list_saved_views' %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" href="{{ url_for('custom_reports.list_saved_views') }}">
-                                            <i class="fas fa-save w-4 mr-2"></i>{{ _('Saved Views') }}
-                                        </a>
-                                    </li>
-                                    {% endif %}
-                                    {% if is_module_enabled('scheduled_reports') %}
-                                    <li>
-                                        <a data-no-propagation="true" class="block px-2 py-1 rounded {% if ep.startswith('scheduled_reports.') %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" href="{{ url_for('scheduled_reports.list_scheduled') }}">
-                                            <i class="fas fa-clock w-4 mr-2"></i>{{ _('Scheduled Reports') }}
-                                        </a>
-                                    </li>
-                                    {% endif %}
-                                </ul>
+                                <a class="block px-2 py-1 rounded {% if ep == 'custom_reports.report_builder' or ep == 'custom_reports.view_custom_report' %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" href="{{ url_for('custom_reports.report_builder') }}">
+                                    <i class="fas fa-magic w-4 mr-2"></i>{{ _('Report Builder') }}
+                                </a>
+                            </li>
+                            <li>
+                                <a class="block px-2 py-1 rounded {% if ep == 'custom_reports.list_saved_views' %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" href="{{ url_for('custom_reports.list_saved_views') }}">
+                                    <i class="fas fa-save w-4 mr-2"></i>{{ _('Saved Views') }}
+                                </a>
+                            </li>
+                            {% endif %}
+                            {% if is_module_enabled('scheduled_reports') %}
+                            <li>
+                                <a class="block px-2 py-1 rounded {% if ep.startswith('scheduled_reports.') %}text-primary font-semibold bg-background-light dark:bg-background-dark{% else %}text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark{% endif %}" href="{{ url_for('scheduled_reports.list_scheduled') }}">
+                                    <i class="fas fa-clock w-4 mr-2"></i>{{ _('Scheduled Reports') }}
+                                </a>
                             </li>
                             {% endif %}
                             {% if is_module_enabled('invoices') %}
@@ -751,7 +741,14 @@ <h1 class="text-2xl font-bold text-primary sidebar-header-title min-w-0"><a href
                             <span class="ml-3 sidebar-label">{{ _('Help') }}</span>
                         </a>
                     </li>
-                    {% if current_user.is_authenticated and current_user.ui_show_donate and not is_license_activated %}
+                    {% if is_license_activated %}
+                    <li class="mt-2">
+                        <div class="sidebar-nav-item flex items-center p-2 rounded-lg bg-emerald-500/10 border border-emerald-500/20" title="{{ _('Supporter') }}">
+                            <i class="fas fa-star w-6 text-center text-emerald-600 dark:text-emerald-400" aria-hidden="true"></i>
+                            <span class="ml-3 sidebar-label text-sm font-medium text-emerald-700 dark:text-emerald-300">{{ _('Supporter') }}</span>
+                        </div>
+                    </li>
+                    {% elif current_user.is_authenticated and current_user.ui_show_donate %}
                     <li class="mt-2">
                         <button type="button" class="sidebar-nav-item w-full text-left flex items-center p-2 rounded-lg bg-gradient-to-r from-amber-500/10 to-orange-500/10 border border-amber-500/20 text-amber-600 dark:text-amber-400 hover:from-amber-500/20 hover:to-orange-500/20 hover:border-amber-500/30 transition-all duration-200 group js-open-support-modal" title="{{ _('Open support options') }}">
                             <i class="fas fa-heart w-6 text-center group-hover:scale-110 transition-transform" aria-hidden="true"></i>
diff --git a/app/templates/partials/_topbar.html b/app/templates/partials/_topbar.html
index e6005992..c407a7e5 100644
--- a/app/templates/partials/_topbar.html
+++ b/app/templates/partials/_topbar.html
@@ -46,7 +46,12 @@
                         <div id="floatingTimerBar" class="flex shrink-0 items-center justify-center w-9 h-9"
                              data-start-label="{{ _('Start Timer') }}"
                              data-stop-label="{{ _('Stop') }}"
+                             data-pause-label="{{ _('Pause') }}"
+                             data-resume-label="{{ _('Resume') }}"
+                             data-daily-target-hours="{{ current_user.standard_hours_per_day or 8 }}"
+                             data-dashboard-url="{{ url_for('main.dashboard') }}"
                              data-manual-url="{{ url_for('timer.manual_entry') }}"
+                             data-switch-label="{{ _('Switch project') }}"
                              aria-label="{{ _('Timer') }}"></div>
                         {% endif %}
                         <a href="{{ url_for('main.help') }}" class="flex items-center justify-center w-9 h-9 rounded-lg text-text-light dark:text-text-dark hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-primary/50" aria-label="{{ _('Help') }}" title="{{ _('Help') }}">
@@ -102,7 +107,7 @@
                                 {% endif %}
                                 <span class="hidden md:inline text-text-light dark:text-text-dark font-medium">{{ current_user.display_name }}</span>
                                 {% if is_license_activated %}
-                                <span class="hidden md:inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-emerald-100 text-emerald-800 dark:bg-emerald-900/40 dark:text-emerald-200 border border-emerald-200/80 dark:border-emerald-700/60" title="{{ _('Supporter') }}">{{ _('Supporter') }}</span>
+                                <span class="hidden md:inline-flex items-center gap-1 px-2 py-0.5 rounded-full text-xs font-medium bg-emerald-100 text-emerald-800 dark:bg-emerald-900/40 dark:text-emerald-200 border border-emerald-200/80 dark:border-emerald-700/60" title="{{ _('Supporter') }}"><i class="fas fa-star" aria-hidden="true"></i>{{ _('Supporter') }}</span>
                                 {% endif %}
                             {% else %}
                                 <div class="w-8 h-8 rounded-full bg-gray-400 flex items-center justify-center">
diff --git a/app/templates/projects/list.html b/app/templates/projects/list.html
index 0703e47b..c52cba09 100644
--- a/app/templates/projects/list.html
+++ b/app/templates/projects/list.html
@@ -192,14 +192,23 @@ <h3 class="text-sm font-medium">
                         {% set consumed = (project.budget_consumed_amount or 0.0) %}
                         {% set total = project.budget_amount|float %}
                         {% set pct = (consumed / total * 100) if total > 0 else 0 %}
-                        {% if pct >= 90 %}
-                            {% set badge_classes = 'bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300' %}
-                        {% elif pct >= 70 %}
-                            {% set badge_classes = 'bg-amber-100 text-amber-700 dark:bg-amber-900/30 dark:text-amber-300' %}
-                        {% else %}
-                            {% set badge_classes = 'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-300' %}
-                        {% endif %}
-                        <span class="px-2 py-1 rounded-full text-xs font-medium whitespace-nowrap {{ badge_classes }}">{{ pct|round(0) }}%</span>
+                        <div class="min-w-[7rem]">
+                            <div class="flex justify-between items-center mb-1">
+                                <span class="text-xs font-semibold
+                                    {% if pct >= 90 %}text-red-600 dark:text-red-400
+                                    {% elif pct >= 70 %}text-amber-600 dark:text-amber-400
+                                    {% else %}text-green-600 dark:text-green-400{% endif %}">
+                                    {{ pct|round(0) }}%
+                                </span>
+                            </div>
+                            <div class="w-full h-1.5 bg-gray-200 dark:bg-gray-700 rounded-full overflow-hidden">
+                                <div class="h-full rounded-full transition-all duration-300
+                                    {% if pct >= 90 %}bg-red-500
+                                    {% elif pct >= 70 %}bg-amber-500
+                                    {% else %}bg-green-500{% endif %}"
+                                    style="width: {{ [pct,100]|min }}%"></div>
+                            </div>
+                        </div>
                     {% else %}
                         <span class="text-text-muted-light dark:text-text-muted-dark">—</span>
                     {% endif %}
diff --git a/app/templates/recurring_tasks/_form_fields.html b/app/templates/recurring_tasks/_form_fields.html
new file mode 100644
index 00000000..05df21b2
--- /dev/null
+++ b/app/templates/recurring_tasks/_form_fields.html
@@ -0,0 +1,113 @@
+<div class="bg-card-light dark:bg-card-dark p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm">
+    <form method="POST" id="recurringTaskForm">
+        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+
+        <div class="space-y-6">
+            <div>
+                <h3 class="text-lg font-semibold mb-4">{{ _('Basic Information') }}</h3>
+                <div class="space-y-4">
+                    <div>
+                        <label for="name" class="block text-sm font-medium mb-2">{{ _('Task Name Template') }} *</label>
+                        <input type="text" id="name" name="name" value="{{ recurring_task.name if recurring_task else '' }}" required class="form-input w-full" placeholder="{{ _('e.g., Weekly Team Meeting') }}">
+                        <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('This will be used as the base name for created tasks') }}</p>
+                    </div>
+
+                    <div>
+                        <label for="project_id" class="block text-sm font-medium mb-2">{{ _('Project') }} *</label>
+                        <select id="project_id" name="project_id" required class="form-input w-full">
+                            <option value="">{{ _('Select a project') }}</option>
+                            {% for project in projects %}
+                            <option value="{{ project.id }}" {% if recurring_task and recurring_task.project_id == project.id %}selected{% endif %}>
+                                {{ project.name }}
+                            </option>
+                            {% endfor %}
+                        </select>
+                    </div>
+
+                    <div>
+                        <label for="description" class="block text-sm font-medium mb-2">{{ _('Description') }}</label>
+                        <textarea id="description" name="description" rows="4" class="form-input w-full">{{ recurring_task.description if recurring_task else '' }}</textarea>
+                    </div>
+                </div>
+            </div>
+
+            <div>
+                <h3 class="text-lg font-semibold mb-4">{{ _('Schedule') }}</h3>
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <div>
+                        <label for="frequency" class="block text-sm font-medium mb-2">{{ _('Frequency') }} *</label>
+                        <select id="frequency" name="frequency" required class="form-input w-full">
+                            <option value="daily" {% if recurring_task and recurring_task.frequency == 'daily' %}selected{% endif %}>{{ _('Daily') }}</option>
+                            <option value="weekly" {% if recurring_task and recurring_task.frequency == 'weekly' %}selected{% endif %}>{{ _('Weekly') }}</option>
+                            <option value="monthly" {% if recurring_task and recurring_task.frequency == 'monthly' %}selected{% endif %}>{{ _('Monthly') }}</option>
+                            <option value="yearly" {% if recurring_task and recurring_task.frequency == 'yearly' %}selected{% endif %}>{{ _('Yearly') }}</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <label for="interval" class="block text-sm font-medium mb-2">{{ _('Interval') }}</label>
+                        <input type="number" id="interval" name="interval" value="{{ recurring_task.interval if recurring_task else 1 }}" min="1" class="form-input w-full">
+                        <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Repeat every N periods (e.g., every 2 weeks)') }}</p>
+                    </div>
+
+                    <div>
+                        <label for="next_run_date" class="block text-sm font-medium mb-2">{{ _('Next Run Date') }} *</label>
+                        <input type="date" id="next_run_date" name="next_run_date" value="{{ recurring_task.next_run_date|local_date('%Y-%m-%d') if recurring_task and recurring_task.next_run_date else '' }}" required class="form-input w-full">
+                    </div>
+
+                    <div>
+                        <label for="end_date" class="block text-sm font-medium mb-2">{{ _('End Date') }}</label>
+                        <input type="date" id="end_date" name="end_date" value="{{ recurring_task.end_date|local_date('%Y-%m-%d') if recurring_task and recurring_task.end_date else '' }}" class="form-input w-full">
+                        <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Optional: Stop creating tasks after this date') }}</p>
+                    </div>
+                </div>
+            </div>
+
+            <div>
+                <h3 class="text-lg font-semibold mb-4">{{ _('Task Settings') }}</h3>
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <div>
+                        <label for="priority" class="block text-sm font-medium mb-2">{{ _('Priority') }}</label>
+                        <select id="priority" name="priority" class="form-input w-full">
+                            <option value="low" {% if recurring_task and recurring_task.priority == 'low' %}selected{% endif %}>{{ _('Low') }}</option>
+                            <option value="medium" {% if not recurring_task or recurring_task.priority == 'medium' %}selected{% endif %}>{{ _('Medium') }}</option>
+                            <option value="high" {% if recurring_task and recurring_task.priority == 'high' %}selected{% endif %}>{{ _('High') }}</option>
+                            <option value="urgent" {% if recurring_task and recurring_task.priority == 'urgent' %}selected{% endif %}>{{ _('Urgent') }}</option>
+                        </select>
+                    </div>
+
+                    <div>
+                        <label for="estimated_hours" class="block text-sm font-medium mb-2">{{ _('Estimated Hours') }}</label>
+                        <input type="number" id="estimated_hours" name="estimated_hours" step="0.25" value="{{ recurring_task.estimated_hours if recurring_task and recurring_task.estimated_hours else '' }}" class="form-input w-full">
+                    </div>
+
+                    <div>
+                        <label for="assigned_to" class="block text-sm font-medium mb-2">{{ _('Assign To') }}</label>
+                        <select id="assigned_to" name="assigned_to" class="form-input w-full">
+                            <option value="">{{ _('Unassigned') }}</option>
+                            {% for user in users %}
+                            <option value="{{ user.id }}" {% if recurring_task and recurring_task.assigned_to == user.id %}selected{% endif %}>
+                                {{ user.username }}
+                            </option>
+                            {% endfor %}
+                        </select>
+                    </div>
+
+                    <div class="flex items-center pt-6">
+                        <label class="flex items-center">
+                            <input type="checkbox" name="auto_assign" {% if recurring_task and recurring_task.auto_assign %}checked{% endif %} class="form-checkbox">
+                            <span class="ml-2 text-sm">{{ _('Auto-assign to creator') }}</span>
+                        </label>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="flex flex-col-reverse sm:flex-row justify-end gap-3 mt-6 pt-6 border-t border-border-light dark:border-border-dark">
+            <a href="{{ url_for('recurring_tasks.list_recurring_tasks') }}" class="px-4 py-2 rounded-lg border border-border-light dark:border-border-dark hover:bg-background-light dark:hover:bg-background-dark text-center">{{ _('Cancel') }}</a>
+            <button type="submit" class="bg-primary text-white px-6 py-2 rounded-lg hover:bg-primary-dark transition-colors">
+                <i class="fas fa-save mr-1"></i>{{ _('Save') }}
+            </button>
+        </div>
+    </form>
+</div>
diff --git a/app/templates/recurring_tasks/create.html b/app/templates/recurring_tasks/create.html
new file mode 100644
index 00000000..d341cc1d
--- /dev/null
+++ b/app/templates/recurring_tasks/create.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% from "components/ui.html" import page_header %}
+
+{% block title %}{{ _('Create Recurring Task') }} - {{ app_name }}{% endblock %}
+
+{% block content %}
+{% set breadcrumbs = [
+    {'text': _('Recurring Tasks'), 'url': url_for('recurring_tasks.list_recurring_tasks')},
+    {'text': _('Create Recurring Task')}
+] %}
+
+{{ page_header(
+    icon_class='fas fa-redo',
+    title_text=_('Create Recurring Task'),
+    subtitle_text=_('Set up automated task creation'),
+    breadcrumbs=breadcrumbs
+) }}
+
+{% include "recurring_tasks/_form_fields.html" %}
+{% endblock %}
diff --git a/app/templates/recurring_tasks/edit.html b/app/templates/recurring_tasks/edit.html
new file mode 100644
index 00000000..4f24c892
--- /dev/null
+++ b/app/templates/recurring_tasks/edit.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% from "components/ui.html" import page_header %}
+
+{% block title %}{{ _('Edit Recurring Task') }} - {{ app_name }}{% endblock %}
+
+{% block content %}
+{% set breadcrumbs = [
+    {'text': _('Recurring Tasks'), 'url': url_for('recurring_tasks.list_recurring_tasks')},
+    {'text': recurring_task.name, 'url': url_for('recurring_tasks.view_recurring_task', task_id=recurring_task.id)},
+    {'text': _('Edit')}
+] %}
+
+{{ page_header(
+    icon_class='fas fa-redo',
+    title_text=_('Edit Recurring Task'),
+    subtitle_text=recurring_task.name,
+    breadcrumbs=breadcrumbs
+) }}
+
+{% include "recurring_tasks/_form_fields.html" %}
+{% endblock %}
diff --git a/app/templates/recurring_tasks/form.html b/app/templates/recurring_tasks/form.html
index 0ce1ef24..bc6f3117 100644
--- a/app/templates/recurring_tasks/form.html
+++ b/app/templates/recurring_tasks/form.html
@@ -16,121 +16,6 @@
     breadcrumbs=breadcrumbs
 ) }}
 
-<div class="bg-card-light dark:bg-card-dark p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm">
-    <form method="POST" id="recurringTaskForm">
-        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-        
-        <div class="space-y-6">
-            <!-- Basic Information -->
-            <div>
-                <h3 class="text-lg font-semibold mb-4">{{ _('Basic Information') }}</h3>
-                <div class="space-y-4">
-                    <div>
-                        <label for="name" class="block text-sm font-medium mb-2">{{ _('Task Name Template') }} *</label>
-                        <input type="text" id="name" name="name" value="{{ recurring_task.name if recurring_task else '' }}" required class="form-input w-full" placeholder="{{ _('e.g., Weekly Team Meeting') }}">
-                        <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('This will be used as the base name for created tasks') }}</p>
-                    </div>
-                    
-                    <div>
-                        <label for="project_id" class="block text-sm font-medium mb-2">{{ _('Project') }} *</label>
-                        <select id="project_id" name="project_id" required class="form-input w-full">
-                            <option value="">{{ _('Select a project') }}</option>
-                            {% for project in projects %}
-                            <option value="{{ project.id }}" {% if recurring_task and recurring_task.project_id == project.id %}selected{% endif %}>
-                                {{ project.name }}
-                            </option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    
-                    <div>
-                        <label for="description" class="block text-sm font-medium mb-2">{{ _('Description') }}</label>
-                        <textarea id="description" name="description" rows="4" class="form-input w-full">{{ recurring_task.description if recurring_task else '' }}</textarea>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Schedule -->
-            <div>
-                <h3 class="text-lg font-semibold mb-4">{{ _('Schedule') }}</h3>
-                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                    <div>
-                        <label for="frequency" class="block text-sm font-medium mb-2">{{ _('Frequency') }} *</label>
-                        <select id="frequency" name="frequency" required class="form-input w-full">
-                            <option value="daily" {% if recurring_task and recurring_task.frequency == 'daily' %}selected{% endif %}>{{ _('Daily') }}</option>
-                            <option value="weekly" {% if recurring_task and recurring_task.frequency == 'weekly' %}selected{% endif %}>{{ _('Weekly') }}</option>
-                            <option value="monthly" {% if recurring_task and recurring_task.frequency == 'monthly' %}selected{% endif %}>{{ _('Monthly') }}</option>
-                            <option value="yearly" {% if recurring_task and recurring_task.frequency == 'yearly' %}selected{% endif %}>{{ _('Yearly') }}</option>
-                        </select>
-                    </div>
-                    
-                    <div>
-                        <label for="interval" class="block text-sm font-medium mb-2">{{ _('Interval') }}</label>
-                        <input type="number" id="interval" name="interval" value="{{ recurring_task.interval if recurring_task else 1 }}" min="1" class="form-input w-full">
-                        <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Repeat every N periods (e.g., every 2 weeks)') }}</p>
-                    </div>
-                    
-                    <div>
-                        <label for="next_run_date" class="block text-sm font-medium mb-2">{{ _('Next Run Date') }} *</label>
-                        <input type="date" id="next_run_date" name="next_run_date" value="{{ recurring_task.next_run_date|local_date('%Y-%m-%d') if recurring_task and recurring_task.next_run_date else '' }}" required class="form-input w-full">
-                    </div>
-                    
-                    <div>
-                        <label for="end_date" class="block text-sm font-medium mb-2">{{ _('End Date') }}</label>
-                        <input type="date" id="end_date" name="end_date" value="{{ recurring_task.end_date|local_date('%Y-%m-%d') if recurring_task and recurring_task.end_date else '' }}" class="form-input w-full">
-                        <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Optional: Stop creating tasks after this date') }}</p>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Task Settings -->
-            <div>
-                <h3 class="text-lg font-semibold mb-4">{{ _('Task Settings') }}</h3>
-                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                    <div>
-                        <label for="priority" class="block text-sm font-medium mb-2">{{ _('Priority') }}</label>
-                        <select id="priority" name="priority" class="form-input w-full">
-                            <option value="low" {% if recurring_task and recurring_task.priority == 'low' %}selected{% endif %}>{{ _('Low') }}</option>
-                            <option value="medium" {% if not recurring_task or recurring_task.priority == 'medium' %}selected{% endif %}>{{ _('Medium') }}</option>
-                            <option value="high" {% if recurring_task and recurring_task.priority == 'high' %}selected{% endif %}>{{ _('High') }}</option>
-                            <option value="urgent" {% if recurring_task and recurring_task.priority == 'urgent' %}selected{% endif %}>{{ _('Urgent') }}</option>
-                        </select>
-                    </div>
-                    
-                    <div>
-                        <label for="estimated_hours" class="block text-sm font-medium mb-2">{{ _('Estimated Hours') }}</label>
-                        <input type="number" id="estimated_hours" name="estimated_hours" step="0.25" value="{{ recurring_task.estimated_hours if recurring_task and recurring_task.estimated_hours else '' }}" class="form-input w-full">
-                    </div>
-                    
-                    <div>
-                        <label for="assigned_to" class="block text-sm font-medium mb-2">{{ _('Assign To') }}</label>
-                        <select id="assigned_to" name="assigned_to" class="form-input w-full">
-                            <option value="">{{ _('Unassigned') }}</option>
-                            {% for user in users %}
-                            <option value="{{ user.id }}" {% if recurring_task and recurring_task.assigned_to == user.id %}selected{% endif %}>
-                                {{ user.username }}
-                            </option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    
-                    <div class="flex items-center pt-6">
-                        <label class="flex items-center">
-                            <input type="checkbox" name="auto_assign" {% if recurring_task and recurring_task.auto_assign %}checked{% endif %} class="form-checkbox">
-                            <span class="ml-2 text-sm">{{ _('Auto-assign to creator') }}</span>
-                        </label>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="flex flex-col-reverse sm:flex-row justify-end gap-3 mt-6 pt-6 border-t border-border-light dark:border-border-dark">
-            <a href="{{ url_for('recurring_tasks.list_recurring_tasks') }}" class="px-4 py-2 rounded-lg border border-border-light dark:border-border-dark hover:bg-background-light dark:hover:bg-background-dark text-center">{{ _('Cancel') }}</a>
-            <button type="submit" class="bg-primary text-white px-6 py-2 rounded-lg hover:bg-primary-dark transition-colors">
-                <i class="fas fa-save mr-1"></i>{{ _('Save') }}
-            </button>
-        </div>
-    </form>
-</div>
+{% include "recurring_tasks/_form_fields.html" %}
 {% endblock %}
 
diff --git a/app/templates/recurring_tasks/list.html b/app/templates/recurring_tasks/list.html
index a9ec355a..e07b1bdc 100644
--- a/app/templates/recurring_tasks/list.html
+++ b/app/templates/recurring_tasks/list.html
@@ -15,8 +15,30 @@
     breadcrumbs=breadcrumbs
 ) }}
 
-<div class="mb-4 flex justify-end">
-    <a href="{{ url_for('recurring_tasks.create_recurring_task') }}" class="bg-primary text-white px-4 py-2 rounded-lg hover:bg-primary-dark transition-colors">
+<div class="mb-4 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
+    <form method="GET" action="{{ url_for('recurring_tasks.list_recurring_tasks') }}" class="flex flex-wrap items-end gap-3">
+        <div>
+            <label for="statusFilter" class="block text-xs font-medium text-text-muted-light dark:text-text-muted-dark mb-1">{{ _('Status') }}</label>
+            <select id="statusFilter" name="status" class="form-input text-sm py-1.5" onchange="this.form.submit()">
+                <option value="all" {% if status_filter == 'all' %}selected{% endif %}>{{ _('All') }}</option>
+                <option value="active" {% if status_filter == 'active' %}selected{% endif %}>{{ _('Active') }}</option>
+                <option value="inactive" {% if status_filter == 'inactive' %}selected{% endif %}>{{ _('Inactive') }}</option>
+            </select>
+        </div>
+        <div>
+            <label for="projectFilter" class="block text-xs font-medium text-text-muted-light dark:text-text-muted-dark mb-1">{{ _('Project') }}</label>
+            <select id="projectFilter" name="project_id" class="form-input text-sm py-1.5" onchange="this.form.submit()">
+                <option value="">{{ _('All projects') }}</option>
+                {% for project in projects %}
+                <option value="{{ project.id }}" {% if project_filter == project.id %}selected{% endif %}>{{ project.name }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        {% if status_filter != 'all' or project_filter %}
+        <a href="{{ url_for('recurring_tasks.list_recurring_tasks') }}" class="text-sm text-primary hover:underline py-1.5">{{ _('Clear filters') }}</a>
+        {% endif %}
+    </form>
+    <a href="{{ url_for('recurring_tasks.create_recurring_task') }}" class="bg-primary text-white px-4 py-2 rounded-lg hover:bg-primary-dark transition-colors shrink-0">
         <i class="fas fa-plus mr-1"></i>{{ _('Create Recurring Task') }}
     </a>
 </div>
@@ -27,19 +49,29 @@
         <table class="w-full enhanced-table responsive-cards">
             <thead class="bg-background-light dark:bg-background-dark">
                 <tr class="border-b border-border-light dark:border-border-dark">
+                    <th class="text-left px-3 py-3 text-sm font-semibold">{{ _('Active') }}</th>
                     <th class="text-left px-3 py-3 text-sm font-semibold">{{ _('Name') }}</th>
                     <th class="text-left px-3 py-3 text-sm font-semibold">{{ _('Project') }}</th>
                     <th class="text-left px-3 py-3 text-sm font-semibold">{{ _('Frequency') }}</th>
                     <th class="text-left px-3 py-3 text-sm font-semibold">{{ _('Next Run') }}</th>
+                    <th class="text-left px-3 py-3 text-sm font-semibold">{{ _('Last Run') }}</th>
                     <th class="text-left px-3 py-3 text-sm font-semibold">{{ _('Status') }}</th>
                     <th class="text-left px-3 py-3 text-sm font-semibold">{{ _('Actions') }}</th>
                 </tr>
             </thead>
             <tbody>
                 {% for task in recurring_tasks %}
-                <tr class="border-b border-border-light dark:border-border-dark hover:bg-background-light dark:hover:bg-background-dark">
+                <tr class="border-b border-border-light dark:border-border-dark hover:bg-background-light dark:hover:bg-background-dark" data-recurring-task-id="{{ task.id }}">
+                    <td class="p-3" data-label="{{ _('Active') }}">
+                        <label class="relative inline-flex items-center cursor-pointer">
+                            <input type="checkbox" class="sr-only recurring-task-toggle" data-task-id="{{ task.id }}" {% if task.is_active %}checked{% endif %} aria-label="{{ _('Toggle active status for %(name)s', name=task.name) }}">
+                            <span class="w-10 h-5 rounded-full transition-colors {% if task.is_active %}bg-green-500{% else %}bg-gray-300 dark:bg-gray-600{% endif %} relative">
+                                <span class="absolute top-0.5 left-0.5 w-4 h-4 bg-white rounded-full transition-transform {% if task.is_active %}translate-x-5{% endif %}"></span>
+                            </span>
+                        </label>
+                    </td>
                     <td class="p-3" data-label="{{ _('Name') }}">
-                        <div class="font-medium">{{ task.name }}</div>
+                        <a href="{{ url_for('recurring_tasks.view_recurring_task', task_id=task.id) }}" class="font-medium text-primary hover:underline">{{ task.name }}</a>
                         {% if task.description %}
                         <div class="text-xs text-text-muted-light dark:text-text-muted-dark">{{ task.description[:50] }}{% if task.description|length > 50 %}...{% endif %}</div>
                         {% endif %}
@@ -63,13 +95,33 @@
                     </td>
                     <td class="p-3" data-label="{{ _('Next Run') }}">
                         {% if task.next_run_date %}
+                        {% set days_left = task.next_run_date|days_until %}
                         <span class="text-sm">{{ task.next_run_date|local_date }}</span>
+                        <div class="mt-1">
+                            <span class="inline-flex px-2 py-0.5 rounded-full text-xs font-medium
+                                {% if days_left is not none and days_left < 0 %}bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300
+                                {% elif days_left == 0 %}bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-300
+                                {% elif days_left == 1 %}bg-amber-100 text-amber-700 dark:bg-amber-900/30 dark:text-amber-300
+                                {% elif days_left is not none and days_left <= 3 %}bg-amber-100 text-amber-700 dark:bg-amber-900/30 dark:text-amber-300
+                                {% else %}bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-300{% endif %}">
+                                {{ task.next_run_date|relative_due_label }}
+                            </span>
+                        </div>
                         {% else %}
                         <span class="text-text-muted-light dark:text-text-muted-dark">{{ _('Not scheduled') }}</span>
                         {% endif %}
                     </td>
+                    <td class="p-3" data-label="{{ _('Last Run') }}">
+                        <span class="text-sm last-run-cell" data-task-id="{{ task.id }}">
+                            {% if task.last_created_at %}
+                            {{ task.last_created_at|user_datetime }}
+                            {% else %}
+                            <span class="text-text-muted-light dark:text-text-muted-dark">{{ _('Never') }}</span>
+                            {% endif %}
+                        </span>
+                    </td>
                     <td class="p-3" data-label="{{ _('Status') }}">
-                        <span class="px-2 py-1 rounded text-xs font-medium
+                        <span class="status-badge px-2 py-1 rounded text-xs font-medium
                             {% if task.is_active %}bg-green-100 dark:bg-green-900 text-green-800 dark:text-green-200
                             {% else %}bg-gray-100 dark:bg-gray-700 text-gray-800 dark:text-gray-200
                             {% endif %}">
@@ -77,13 +129,16 @@
                         </span>
                     </td>
                     <td class="p-3" data-label="{{ _('Actions') }}">
-                        <div class="flex gap-2">
-                            <a href="{{ url_for('recurring_tasks.edit_recurring_task', task_id=task.id) }}" class="text-primary hover:text-primary-dark">
+                        <div class="flex gap-2 items-center">
+                            <button type="button" class="recurring-run-now {% if task.is_active %}text-green-600 hover:text-green-700{% else %}text-gray-400 cursor-not-allowed{% endif %}" data-task-id="{{ task.id }}" title="{{ _('Run now') }}" aria-label="{{ _('Run now') }}" {% if not task.is_active %}disabled{% endif %}>
+                                <i class="fas fa-play"></i>
+                            </button>
+                            <a href="{{ url_for('recurring_tasks.edit_recurring_task', task_id=task.id) }}" class="text-primary hover:text-primary-dark" title="{{ _('Edit') }}">
                                 <i class="fas fa-edit"></i>
                             </a>
                             <form method="POST" action="{{ url_for('recurring_tasks.delete_recurring_task', task_id=task.id) }}" class="inline" onsubmit="return confirm('{{ _('Are you sure you want to delete this recurring task?') }}');">
                                 <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-                                <button type="submit" class="text-red-600 hover:text-red-700">
+                                <button type="submit" class="text-red-600 hover:text-red-700" title="{{ _('Delete') }}">
                                     <i class="fas fa-trash"></i>
                                 </button>
                             </form>
@@ -97,10 +152,99 @@
 </div>
 {% else %}
 {{ empty_state(
-    icon='fas fa-redo',
-    title=_('No recurring tasks'),
-    message=_('Create recurring task templates to automatically generate tasks on a schedule.')
+    'fas fa-redo',
+    'No recurring tasks',
+    'Create recurring task templates to automatically generate tasks on a schedule.'
 ) }}
 {% endif %}
 {% endblock %}
 
+{% block scripts_extra %}
+<script nonce="{{ csp_nonce() }}">
+document.addEventListener('DOMContentLoaded', function() {
+    var csrfToken = document.querySelector('meta[name="csrf-token"]')?.getAttribute('content') || '';
+
+    function updateToggleUi(checkbox, isActive) {
+        checkbox.checked = isActive;
+        var track = checkbox.nextElementSibling;
+        var knob = track?.querySelector('span');
+        if (track) {
+            track.classList.toggle('bg-green-500', isActive);
+            track.classList.toggle('bg-gray-300', !isActive);
+            track.classList.toggle('dark:bg-gray-600', !isActive);
+        }
+        if (knob) knob.classList.toggle('translate-x-5', isActive);
+        var row = checkbox.closest('tr');
+        var badge = row?.querySelector('.status-badge');
+        if (badge) {
+            badge.textContent = isActive ? {{ _('Active')|tojson }} : {{ _('Inactive')|tojson }};
+            badge.className = 'status-badge px-2 py-1 rounded text-xs font-medium ' + (isActive
+                ? 'bg-green-100 dark:bg-green-900 text-green-800 dark:text-green-200'
+                : 'bg-gray-100 dark:bg-gray-700 text-gray-800 dark:text-gray-200');
+        }
+        var runBtn = row?.querySelector('.recurring-run-now');
+        if (runBtn) runBtn.disabled = !isActive;
+    }
+
+    document.querySelectorAll('.recurring-task-toggle').forEach(function(checkbox) {
+        checkbox.addEventListener('change', async function() {
+            var taskId = this.getAttribute('data-task-id');
+            var previous = !this.checked;
+            try {
+                var res = await fetch('/recurring-tasks/' + taskId + '/toggle', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'X-CSRFToken': csrfToken,
+                        'Accept': 'application/json'
+                    },
+                    credentials: 'same-origin'
+                });
+                var data = await res.json();
+                if (!res.ok) throw new Error(data.error || 'Toggle failed');
+                updateToggleUi(this, data.is_active);
+            } catch (e) {
+                updateToggleUi(this, previous);
+                if (window.toastManager?.error) {
+                    window.toastManager.error({{ _('Could not update status')|tojson }}, '', 3000);
+                }
+            }
+        });
+    });
+
+    document.querySelectorAll('.recurring-run-now').forEach(function(btn) {
+        btn.addEventListener('click', async function() {
+            if (this.disabled) return;
+            var taskId = this.getAttribute('data-task-id');
+            this.disabled = true;
+            try {
+                var res = await fetch('/recurring-tasks/' + taskId + '/run-now', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'X-CSRFToken': csrfToken,
+                        'Accept': 'application/json'
+                    },
+                    credentials: 'same-origin'
+                });
+                var data = await res.json();
+                if (!res.ok) throw new Error(data.error || 'Run failed');
+                var lastCell = document.querySelector('.last-run-cell[data-task-id="' + taskId + '"]');
+                if (lastCell && data.last_created_at) {
+                    lastCell.textContent = new Date(data.last_created_at).toLocaleString();
+                }
+                if (window.toastManager?.success) {
+                    window.toastManager.success({{ _('Task created successfully')|tojson }}, '', 3000);
+                }
+            } catch (e) {
+                if (window.toastManager?.error) {
+                    window.toastManager.error(e.message || {{ _('Could not run recurring task')|tojson }}, '', 4000);
+                }
+            } finally {
+                this.disabled = false;
+            }
+        });
+    });
+});
+</script>
+{% endblock %}
diff --git a/app/templates/recurring_tasks/view.html b/app/templates/recurring_tasks/view.html
new file mode 100644
index 00000000..b0a74ae3
--- /dev/null
+++ b/app/templates/recurring_tasks/view.html
@@ -0,0 +1,101 @@
+{% extends "base.html" %}
+{% from "components/ui.html" import page_header %}
+
+{% block title %}{{ recurring_task.name }} - {{ app_name }}{% endblock %}
+
+{% block content %}
+{% set breadcrumbs = [
+    {'text': _('Recurring Tasks'), 'url': url_for('recurring_tasks.list_recurring_tasks')},
+    {'text': recurring_task.name}
+] %}
+
+{{ page_header(
+    icon_class='fas fa-redo',
+    title_text=recurring_task.name,
+    subtitle_text=_('Recurring Task Template'),
+    breadcrumbs=breadcrumbs,
+    actions_html=''
+        + '<a href="' + url_for("recurring_tasks.edit_recurring_task", task_id=recurring_task.id) + '" class="bg-primary text-white px-4 py-2 rounded-lg hover:bg-primary-dark mr-2">' + _('Edit') + '</a>'
+        + '<form method="POST" action="' + url_for("recurring_tasks.delete_recurring_task", task_id=recurring_task.id) + '" class="inline" onsubmit="return confirm(\'' + _('Are you sure you want to delete this recurring task?')|e + '\');">'
+        + '<input type="hidden" name="csrf_token" value="' + csrf_token() + '">'
+        + '<button type="submit" class="bg-red-600 text-white px-4 py-2 rounded-lg hover:bg-red-700">' + _('Delete') + '</button>'
+        + '</form>'
+) }}
+
+<div class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-6">
+    <div class="bg-card-light dark:bg-card-dark p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm">
+        <h3 class="text-lg font-semibold mb-4">{{ _('Template Details') }}</h3>
+        <dl class="space-y-3">
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Project') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark">
+                    {% if recurring_task.project %}
+                    <a href="{{ url_for('projects.view_project', project_id=recurring_task.project.id) }}" class="text-primary hover:underline">{{ recurring_task.project.name }}</a>
+                    {% else %}
+                    {{ _('No project') }}
+                    {% endif %}
+                </dd>
+            </div>
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Frequency') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark">
+                    {{ recurring_task.frequency|title }}
+                    {% if recurring_task.interval > 1 %}({{ recurring_task.interval }}){% endif %}
+                </dd>
+            </div>
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Next Run Date') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark">
+                    {% if recurring_task.next_run_date %}{{ recurring_task.next_run_date|local_date }}{% else %}{{ _('Not scheduled') }}{% endif %}
+                </dd>
+            </div>
+            {% if recurring_task.end_date %}
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('End Date') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark">{{ recurring_task.end_date|local_date }}</dd>
+            </div>
+            {% endif %}
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Status') }}</dt>
+                <dd class="text-sm">
+                    <span class="px-2 py-1 rounded text-xs font-medium {% if recurring_task.is_active %}bg-green-100 dark:bg-green-900 text-green-800 dark:text-green-200{% else %}bg-gray-100 dark:bg-gray-700 text-gray-800 dark:text-gray-200{% endif %}">
+                        {% if recurring_task.is_active %}{{ _('Active') }}{% else %}{{ _('Inactive') }}{% endif %}
+                    </span>
+                </dd>
+            </div>
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Tasks Created') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark">{{ recurring_task.tasks_created_count or 0 }}</dd>
+            </div>
+        </dl>
+    </div>
+
+    <div class="bg-card-light dark:bg-card-dark p-6 rounded-xl border border-border-light dark:border-border-dark shadow-sm">
+        <h3 class="text-lg font-semibold mb-4">{{ _('Task Settings') }}</h3>
+        <dl class="space-y-3">
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Priority') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark">{{ recurring_task.priority|title }}</dd>
+            </div>
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Estimated Hours') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark">
+                    {% if recurring_task.estimated_hours %}{{ recurring_task.estimated_hours }}{% else %}{{ _('Not set') }}{% endif %}
+                </dd>
+            </div>
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Assigned To') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark">
+                    {% if recurring_task.assignee %}{{ recurring_task.assignee.username }}{% elif recurring_task.auto_assign %}{{ _('Creator (auto-assign)') }}{% else %}{{ _('Unassigned') }}{% endif %}
+                </dd>
+            </div>
+            {% if recurring_task.description %}
+            <div>
+                <dt class="text-sm font-medium text-text-muted-light dark:text-text-muted-dark">{{ _('Description') }}</dt>
+                <dd class="text-sm text-text-light dark:text-text-dark whitespace-pre-wrap">{{ recurring_task.description }}</dd>
+            </div>
+            {% endif %}
+        </dl>
+    </div>
+</div>
+{% endblock %}
diff --git a/app/templates/timer/manual_entry.html b/app/templates/timer/manual_entry.html
index 3d429fae..b793f951 100644
--- a/app/templates/timer/manual_entry.html
+++ b/app/templates/timer/manual_entry.html
@@ -1384,4 +1384,5 @@ <h2 class="text-sm font-semibold text-text-light dark:text-text-dark uppercase t
 })();
 </script>
 {% endif %}
+<script src="{{ url_for('static', filename='notes-autocomplete.js') }}" defer></script>
 {% endblock %}
diff --git a/app/templates/timer/timer_page.html b/app/templates/timer/timer_page.html
index 46356b2a..da27c257 100644
--- a/app/templates/timer/timer_page.html
+++ b/app/templates/timer/timer_page.html
@@ -217,7 +217,8 @@ <h2 class="text-lg font-semibold mb-4">{{ _('Start New Timer') }}</h2>
                         <label for="notes" class="form-label">
                             {{ _('Notes') }} <span class="text-text-muted-light dark:text-text-muted-dark">({{ _('Optional') }})</span>
                         </label>
-                        <textarea name="notes" id="notes" rows="3" class="form-input w-full" placeholder="{{ _('Add notes about what you\'re working on...') }}"></textarea>
+                        <textarea name="notes" id="notes" rows="3" class="form-input w-full" placeholder="{{ _('Add notes about what you\'re working on...') }}" list="notesSuggestions"></textarea>
+                        <datalist id="notesSuggestions"></datalist>
                     </div>
                     
                     {% if templates %}
@@ -306,6 +307,7 @@ <h2 class="text-lg font-semibold mb-4">{{ _("Today's Stats") }}</h2>
 {% endblock %}
 
 {% block scripts_extra %}
+<script src="{{ url_for('static', filename='notes-autocomplete.js') }}" defer></script>
 <script nonce="{{ csp_nonce() }}">
 document.addEventListener('DOMContentLoaded', function() {
 // Load tasks when project is selected; keep client→project→task cascade (Issue #728)
diff --git a/app/templates/user/license.html b/app/templates/user/license.html
index 70c86efa..2bcc2cf7 100644
--- a/app/templates/user/license.html
+++ b/app/templates/user/license.html
@@ -1,54 +1,63 @@
 {% extends "base.html" %}
-{% block title %}{{ _('License') }} - {{ _('Settings') }}{% endblock %}
+{% block title %}{{ _('Become a Supporter') }} - {{ _('Settings') }}{% endblock %}
 
 {% block content %}
 <div class="container mx-auto px-4 py-8 max-w-2xl">
     <div class="mb-6">
-        <h1 class="text-3xl font-bold text-gray-900 dark:text-white">{{ _('License') }}</h1>
-        <p class="text-gray-600 dark:text-gray-400 mt-2">{{ _('Supporter badge: confirm your key and thank you for funding development.') }}</p>
+        <h1 class="text-3xl font-bold text-gray-900 dark:text-white">{{ _('Become a Supporter') }}</h1>
+        <p class="text-gray-600 dark:text-gray-400 mt-2">{{ _('Support TimeTracker development and show your Supporter badge across the app.') }}</p>
     </div>
 
     <div class="bg-card-light dark:bg-card-dark border border-border-light dark:border-border-dark rounded-lg shadow-md p-6 mb-6">
-        <h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-3">{{ _('License status') }}</h2>
+        <h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-3">{{ _('Supporter status') }}</h2>
         {% if is_license_activated %}
+        <div class="rounded-lg bg-emerald-50 dark:bg-emerald-900/20 border border-emerald-200 dark:border-emerald-800 p-4 mb-4">
+            <p class="flex items-center gap-2 text-emerald-700 dark:text-emerald-300 font-medium">
+                <i class="fas fa-star" aria-hidden="true"></i>
+                {{ _('Thank you for being a Supporter!') }}
+            </p>
+            <p class="text-sm text-emerald-800 dark:text-emerald-200 mt-2">
+                {{ _('Your contribution helps keep TimeTracker free and actively maintained. You will see your Supporter badge in the app, and support prompts are minimized for everyone on this instance.') }}
+            </p>
+        </div>
         <p class="flex items-center gap-2 text-green-600 dark:text-green-400">
             <i class="fas fa-check-circle" aria-hidden="true"></i>
             {{ _('Supporter license active') }}
         </p>
-        <p class="text-sm text-text-muted-light dark:text-text-muted-dark mt-2">{{ _('Thank you for supporting TimeTracker. Your badge confirms this instance as a supporter — no features are locked.') }}</p>
+        <p class="text-sm text-text-muted-light dark:text-text-muted-dark mt-2">{{ _('No features are locked — this is a thank-you badge, not a paywall.') }}</p>
         {% else %}
         <p class="flex items-center gap-2 text-text-muted-light dark:text-text-muted-dark">
             <i class="fas fa-circle-info" aria-hidden="true"></i>
-            {{ _('Not activated') }}
+            {{ _('Not yet a Supporter') }}
         </p>
         <p class="text-sm text-text-muted-light dark:text-text-muted-dark mt-2">
-            {{ _('Purchase a supporter license (€25) to unlock the supporter badge for this instance. The app stays fully free either way.') }}
+            {{ _('Become a Supporter with a one-time €25 contribution. You keep full access either way — supporters get a visible badge and fewer prompts.') }}
         </p>
         <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" class="inline-flex items-center gap-2 mt-3 px-4 py-2 bg-primary hover:bg-primary/90 text-white rounded-md text-sm font-medium transition">
-            {{ _('Buy license (€25)') }} <i class="fas fa-external-link-alt text-xs" aria-hidden="true"></i>
+            <i class="fas fa-star" aria-hidden="true"></i>{{ _('Support TimeTracker (€25)') }} <i class="fas fa-external-link-alt text-xs" aria-hidden="true"></i>
         </a>
         {% endif %}
     </div>
 
     {% if not is_license_activated %}
     <div class="bg-card-light dark:bg-card-dark border border-border-light dark:border-border-dark rounded-lg shadow-md p-6">
-        <h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-3">{{ _('Enter license key') }}</h2>
-        <p class="text-sm text-text-muted-light dark:text-text-muted-dark mb-4">{{ _('Paste the license key you received by email after purchase.') }}</p>
+        <h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-3">{{ _('Enter supporter key') }}</h2>
+        <p class="text-sm text-text-muted-light dark:text-text-muted-dark mb-4">{{ _('Already purchased? Paste the key you received by email. As a side effect, support prompts are minimized for this instance.') }}</p>
         <form method="POST" action="{{ url_for('user.license') }}">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
             <div class="mb-4">
-                <label for="license_key" class="form-label">{{ _('License key') }}</label>
+                <label for="license_key" class="form-label">{{ _('Supporter key') }}</label>
                 <input type="text" id="license_key" name="license_key" autocomplete="off"
                        class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 dark:text-white focus:ring-primary focus:border-primary"
                        placeholder="{{ _('Paste your key here') }}">
             </div>
             <button type="submit" class="btn btn-primary">
-                <i class="fas fa-check mr-2" aria-hidden="true"></i>{{ _('Validate') }}
+                <i class="fas fa-check mr-2" aria-hidden="true"></i>{{ _('Activate Supporter badge') }}
             </button>
         </form>
         <p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-4">
             {{ _('Need a key?') }}
-            <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" class="text-primary hover:underline">{{ _('Purchase a license key') }}</a>
+            <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" class="text-primary hover:underline">{{ _('Become a Supporter') }}</a>
         </p>
     </div>
     {% endif %}
diff --git a/app/templates/user/settings.html b/app/templates/user/settings.html
index 847eabf8..678fad29 100644
--- a/app/templates/user/settings.html
+++ b/app/templates/user/settings.html
@@ -10,21 +10,26 @@ <h1 class="text-3xl font-bold text-gray-900 dark:text-white">{{ _('Settings') }}
 
     <details class="bg-card-light dark:bg-card-dark rounded-lg shadow-md group mb-6" open>
         <summary class="flex items-center justify-between p-6 cursor-pointer select-none list-none [&::-webkit-details-marker]:hidden">
-            <h2 class="text-xl font-semibold text-gray-900 dark:text-white">
-                <i class="fas fa-heart mr-2 text-amber-600 dark:text-amber-400" aria-hidden="true"></i>{{ _('Support & Community') }}
+            <h2 class="text-xl font-semibold text-gray-900 dark:text-white flex items-center flex-wrap gap-2">
+                <span><i class="fas fa-heart mr-2 text-amber-600 dark:text-amber-400" aria-hidden="true"></i>{{ _('Support & Community') }}</span>
+                {% if is_license_activated %}
+                <span class="inline-flex items-center gap-1 px-2.5 py-0.5 rounded-full text-xs font-medium bg-emerald-100 text-emerald-800 dark:bg-emerald-900/40 dark:text-emerald-200 border border-emerald-200/80 dark:border-emerald-700/60">
+                    <i class="fas fa-star" aria-hidden="true"></i>{{ _('Supporter') }}
+                </span>
+                {% endif %}
             </h2>
             <i class="fas fa-chevron-down text-gray-400 transition-transform group-open:rotate-180 md:hidden"></i>
         </summary>
         <div class="px-6 pb-6 space-y-4 text-sm text-text-light dark:text-text-dark">
             <p class="text-text-muted-light dark:text-text-muted-dark">{{ _('TimeTracker is free and open source. Funding comes from optional donations and supporter licenses — never from locking features.') }}</p>
             {% if is_license_activated %}
-            <p>{{ _('This instance already has a supporter license. Thank you — you can still donate or share the app anytime.') }}</p>
+            <p>{{ _('Thank you for being a TimeTracker Supporter. Your badge shows across the app — you can still donate or share anytime.') }}</p>
             {% else %}
-            <p>{{ _('If the app saves you time, you can donate or buy a supporter license (€25). A license shows a Supporter badge; it does not change what you can use.') }}</p>
+            <p>{{ _('If the app saves you time, become a Supporter with a one-time €25 contribution. You keep full access either way — supporters get a visible badge and fewer prompts.') }}</p>
             {% endif %}
             <div class="flex flex-wrap gap-2">
                 <button type="button" class="btn btn-primary js-open-support-modal">{{ _('Support TimeTracker') }}</button>
-                <a href="{{ url_for('user.license') }}" class="btn btn-secondary inline-flex items-center gap-2"><i class="fas fa-key" aria-hidden="true"></i>{{ _('License & supporter key') }}</a>
+                <a href="{{ url_for('user.license') }}" class="btn btn-secondary inline-flex items-center gap-2"><i class="fas fa-star" aria-hidden="true"></i>{{ _('Become a Supporter') }}</a>
                 <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" class="btn btn-secondary">{{ _('Checkout on timetracker.drytrix.com') }} <i class="fas fa-external-link-alt text-xs" aria-hidden="true"></i></a>
             </div>
         </div>
@@ -607,9 +612,9 @@ <h2 class="text-xl font-semibold text-gray-900 dark:text-white">
         </details>
 
         <p class="text-sm text-text-muted-light dark:text-text-muted-dark">
-            {{ _('Support visibility (hiding donate/support UI) is configured system-wide by administrators in Admin → Settings.') }}
-            {{ _('Administrators can purchase a key to hide these prompts:') }}
-            <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" class="text-blue-600 dark:text-blue-400 hover:underline">{{ _('Support & Purchase Key') }}</a>.
+            {{ _('Supporter status is configured instance-wide by administrators in Admin → Settings.') }}
+            {{ _('Anyone can become a Supporter:') }}
+            <a href="{{ support_purchase_url }}" target="_blank" rel="noopener noreferrer" class="text-blue-600 dark:text-blue-400 hover:underline">{{ _('Support TimeTracker') }}</a>.
         </p>
 
         <!-- Save Button - Sticky on mobile -->
diff --git a/app/templates/workflows/list.html b/app/templates/workflows/list.html
index 1d606466..de72ca03 100644
--- a/app/templates/workflows/list.html
+++ b/app/templates/workflows/list.html
@@ -51,7 +51,25 @@
                         <span class="inline-flex px-2 py-1 text-xs font-medium rounded-full bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300">{{ _('Disabled') }}</span>
                         {% endif %}
                     </td>
-                    <td class="px-6 py-4 text-sm">{{ workflow.execution_count or 0 }}</td>
+                    <td class="px-6 py-4 text-sm">
+                        {{ workflow.execution_count or 0 }}
+                        {% set last_exec = last_executions.get(workflow.id) if last_executions is defined else none %}
+                        {% if last_exec %}
+                        <a href="{{ url_for('workflows.view_workflow', workflow_id=workflow.id) }}#executions"
+                           class="ml-2 inline-flex items-center"
+                           title="{% if last_exec.success %}{{ _('Last run succeeded') }}{% else %}{{ _('Last run failed') }}{% endif %}">
+                            {% if last_exec.success %}
+                            <span class="inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200">
+                                <i class="fas fa-check mr-1"></i>{{ _('OK') }}
+                            </span>
+                            {% else %}
+                            <span class="inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200">
+                                <i class="fas fa-times mr-1"></i>{{ _('Failed') }}
+                            </span>
+                            {% endif %}
+                        </a>
+                        {% endif %}
+                    </td>
                     <td class="px-6 py-4 text-right space-x-2">
                         <a href="{{ url_for('workflows.edit_workflow', workflow_id=workflow.id) }}" class="text-gray-500 hover:text-blue-600" title="{{ _('Edit') }}">
                             <i class="fas fa-edit"></i>
@@ -71,11 +89,14 @@
     </div>
 </div>
 {% else %}
+{% set workflow_create_action %}
+<a href="{{ url_for('workflows.create_workflow') }}" class="btn btn-primary mt-4"><i class="fas fa-plus mr-2"></i>{{ _('Create Workflow') }}</a>
+{% endset %}
 {{ empty_state(
-    icon_class='fas fa-sitemap',
-    title=_('No workflows yet'),
-    message=_('Create automation rules or start from a template.'),
-    action_html='<a href="' + url_for("workflows.create_workflow") + '" class="btn btn-primary mt-4"><i class="fas fa-plus mr-2"></i>' + _('Create Workflow') + '</a>'
+    'fas fa-sitemap',
+    'No workflows yet',
+    'Create automation rules or start from a template.',
+    workflow_create_action
 ) }}
 {% endif %}
 {% endblock %}
diff --git a/app/utils/context_processors.py b/app/utils/context_processors.py
index 6d01b384..aa830eb9 100644
--- a/app/utils/context_processors.py
+++ b/app/utils/context_processors.py
@@ -229,8 +229,12 @@ def inject_globals():
                     v = layout_support_prompt.get("variant")
                     if v == SupportPromptService.VARIANT_AFTER_REPORT:
                         lp_message = _(
-                            "That report was quick to generate. If TimeTracker saves you time, "
-                            "consider supporting its development."
+                            "Report exported — if TimeTracker saves you time, a coffee goes a long way."
+                        )
+                    elif v == SupportPromptService.VARIANT_FIRST_INVOICE:
+                        lp_message = _(
+                            "You just sent your first invoice with TimeTracker — if the app is helping your "
+                            "business, consider supporting its development."
                         )
 
                 support_ui_json = json.dumps(
@@ -259,8 +263,8 @@ def inject_globals():
                             "shareFail": _("Could not copy link"),
                             "supportAction": _("Support"),
                             "longSessionToast": _(
-                                "You have been using TimeTracker actively for a while. "
-                                "If it helps your work, consider supporting its development."
+                                "You've been tracking for a while today. TimeTracker is free because of "
+                                "supporters like you."
                             ),
                         },
                     },
diff --git a/app/utils/email.py b/app/utils/email.py
index 16960ee1..8dc5c22a 100644
--- a/app/utils/email.py
+++ b/app/utils/email.py
@@ -989,11 +989,28 @@ def send_invoice_email(invoice, recipient_email, sender_user=None, custom_messag
         db.session.add(invoice_email)
 
         # Update invoice status to 'sent' if it's still 'draft'
-        if invoice.status == "draft":
+        was_first_send = invoice.status == "draft"
+        if was_first_send:
             invoice.status = "sent"
 
         db.session.commit()
 
+        if was_first_send:
+            try:
+                from app.models import Invoice
+
+                sent_statuses = ("sent", "paid", "overdue", "issued")
+                sent_count = (
+                    Invoice.query.filter(
+                        Invoice.created_by == sender_id, Invoice.status.in_(sent_statuses)
+                    ).count()
+                )
+                from app.utils.support_invoice_sent import queue_first_invoice_support_prompt
+
+                queue_first_invoice_support_prompt(sender_id, first_send=sent_count == 1)
+            except Exception:
+                pass
+
         return True, invoice_email, f"Invoice email sent successfully to {recipient_email}"
 
     except Exception as e:
diff --git a/app/utils/scheduled_tasks.py b/app/utils/scheduled_tasks.py
index 3a027c44..9ea636be 100644
--- a/app/utils/scheduled_tasks.py
+++ b/app/utils/scheduled_tasks.py
@@ -955,7 +955,7 @@ def check_idle_timers():
                     if getattr(notified_at, "tzinfo", None) is not None:
                         notified_at = notified_at.replace(tzinfo=None)
                     if (now - notified_at) >= grace:
-                        stop_at = entry.last_heartbeat_at or entry.start_time
+                        stop_at = entry.last_heartbeat_at or (now - threshold)
                         if getattr(stop_at, "tzinfo", None) is not None:
                             stop_at = stop_at.replace(tzinfo=None)
                         if stop_at and stop_at > now:
diff --git a/app/utils/support_invoice_sent.py b/app/utils/support_invoice_sent.py
new file mode 100644
index 00000000..2fb74c4c
--- /dev/null
+++ b/app/utils/support_invoice_sent.py
@@ -0,0 +1,12 @@
+"""Hook first invoice send for support soft prompts."""
+
+from __future__ import annotations
+
+
+def queue_first_invoice_support_prompt(user_id: int, *, first_send: bool = False) -> None:
+    """Queue a one-shot support prompt when the user sends their first invoice."""
+    from flask import session
+
+    from app.services.support_prompt_service import SupportPromptService
+
+    SupportPromptService.queue_first_invoice_prompt(session, user_id, first_send=first_send)
diff --git a/app/utils/template_filters.py b/app/utils/template_filters.py
index 10b2575b..2602bc8b 100644
--- a/app/utils/template_filters.py
+++ b/app/utils/template_filters.py
@@ -427,6 +427,38 @@ def format_currency_filter(value, currency_code=None):
         symbol = currency_symbols.get((currency_code or "").upper(), currency_code or "EUR")
         return f"{symbol} {num_str}"
 
+    @app.template_filter("days_until")
+    def days_until_filter(d):
+        """Return signed day count from today to date d (negative = overdue)."""
+        if d is None:
+            return None
+        from datetime import date
+
+        if hasattr(d, "date"):
+            d = d.date()
+        return (d - date.today()).days
+
+    @app.template_filter("relative_due_label")
+    def relative_due_label_filter(d):
+        """Human-friendly due date label: Today, Tomorrow, In 3 days, Overdue."""
+        if d is None:
+            return ""
+        from datetime import date
+
+        if hasattr(d, "date"):
+            d = d.date()
+        delta = (d - date.today()).days
+        if delta < 0:
+            days = abs(delta)
+            return f"Overdue ({days} day{'s' if days != 1 else ''})"
+        if delta == 0:
+            return "Today"
+        if delta == 1:
+            return "Tomorrow"
+        if delta <= 7:
+            return f"In {delta} days"
+        return d.strftime("%Y-%m-%d")
+
     @app.template_filter("timeago")
     def timeago_filter(dt):
         """Convert a datetime to a 'time ago' string (e.g., '2 hours ago')"""
diff --git a/browser-extension/manifest.json b/browser-extension/manifest.json
index 660698fa..398236c1 100644
--- a/browser-extension/manifest.json
+++ b/browser-extension/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "TimeTracker Timer",
-  "version": "5.12.0",
+  "version": "5.13.0",
   "description": "Start and stop TimeTracker timers from your browser toolbar.",
   "permissions": ["storage", "alarms", "idle", "notifications"],
   "optional_host_permissions": ["http://*/*", "https://*/*"],
diff --git a/browser-extension/package.json b/browser-extension/package.json
index 894fe319..a0a4313c 100644
--- a/browser-extension/package.json
+++ b/browser-extension/package.json
@@ -1,7 +1,7 @@
 {
   "name": "timetracker-browser-extension",
   "private": true,
-  "version": "5.12.0",
+  "version": "5.13.0",
   "description": "TimeTracker Chromium extension (Manifest V3)",
   "type": "module",
   "scripts": {
diff --git a/desktop/package.json b/desktop/package.json
index 17a1275d..242f5f48 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "timetracker-desktop",
-  "version": "5.12.0",
+  "version": "5.13.0",
   "description": "TimeTracker desktop app for Windows, Linux, and macOS",
   "main": "src/main/main.js",
   "scripts": {
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index a79027d5..f871aa96 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -1,7 +1,7 @@
 name: timetracker_mobile
 description: TimeTracker mobile app for Android and iOS
 publish_to: 'none'
-version: 5.12.0+1
+version: 5.13.0+1
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
diff --git a/setup.py b/setup.py
index 665a5a36..4f706c81 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name='timetracker',
-    version='5.12.0',
+    version='5.13.0',
     packages=find_packages(),
     include_package_data=True,
     package_data={
diff --git a/tests/test_support_services.py b/tests/test_support_services.py
index 67dcfbf2..b6e130b1 100644
--- a/tests/test_support_services.py
+++ b/tests/test_support_services.py
@@ -61,3 +61,47 @@ def test_pick_dashboard_skips_when_after_report_pending():
         today_hours=8.0,
     )
     assert picked is None
+
+
+def test_pick_dashboard_hours_milestone():
+    session = {}
+    user_stats = {"days_since_signup": 3, "time_entries_count": 50, "total_hours": 520.0}
+    picked = SupportPromptService.pick_dashboard_prompt(
+        session,
+        user_stats,
+        ui_show_donate=True,
+        is_supporter=False,
+        support_banner_suppressed=False,
+        today_hours=1.0,
+    )
+    assert picked is not None
+    assert picked.get("variant") == SupportPromptService.VARIANT_HOURS_MILESTONE
+    assert picked.get("milestone") == 500
+
+
+def test_pick_dashboard_anniversary_30d():
+    session = {}
+    user_stats = {"days_since_signup": 35, "time_entries_count": 10, "total_hours": 20.0}
+    picked = SupportPromptService.pick_dashboard_prompt(
+        session,
+        user_stats,
+        ui_show_donate=True,
+        is_supporter=False,
+        support_banner_suppressed=False,
+        today_hours=1.0,
+    )
+    assert picked is not None
+    assert picked.get("variant") == SupportPromptService.VARIANT_ANNIVERSARY_30D
+
+
+def test_consume_layout_prompt_first_invoice():
+    session = {"support_prompt_trigger": SupportPromptService.VARIANT_FIRST_INVOICE}
+    payload = SupportPromptService.consume_layout_prompt(
+        session,
+        ui_show_donate=True,
+        is_supporter=False,
+        support_banner_suppressed=False,
+    )
+    assert payload is not None
+    assert payload.get("variant") == SupportPromptService.VARIANT_FIRST_INVOICE
+    assert session.get(SupportPromptService.SESSION_SOFT_PROMPT_CONSUMED) is True