From 3c9159f2d4ac91549b2c95ebab02c8b019719604 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 11 Feb 2026 17:09:32 +0100
Subject: [PATCH] Conditionally show cost column in report tables; Task/Project
 Modal Field cleanup; improve estimated time UX

---
 e2e/dashboard.spec.ts                         |  73 ++++++-
 e2e/projects.spec.ts                          | 196 +++++++++++++++++-
 e2e/tasks.spec.ts                             |  63 ++++++
 .../Common/Project/ProjectDropdown.vue        | 127 ++++++------
 .../Common/Project/ProjectEditModal.vue       |  83 ++++----
 .../Common/Reporting/ReportingOverview.vue    |  11 +-
 .../Common/Reporting/ReportingRow.vue         |   2 +-
 .../Common/Task/TaskCreateModal.vue           |  40 +++-
 .../Components/Common/Task/TaskEditModal.vue  |  20 +-
 .../Dashboard/ThisWeekReportingTable.vue      |  33 ++-
 .../packages/ui/src/Client/ClientDropdown.vue |  41 ++--
 .../packages/ui/src/EstimatedTimeSection.vue  |  25 +--
 .../ui/src/Input/BillableRateInput.vue        |   2 +
 .../ui/src/Project/ProjectColorSelector.vue   |   4 +-
 .../ui/src/Project/ProjectCreateModal.vue     |  54 ++---
 .../Project/ProjectEditBillableSection.vue    | 147 +++++++++----
 .../ui/src/TimeEntry/TimeEntryEditModal.vue   |   2 +-
 .../js/packages/ui/src/field/FieldLabel.vue   |   7 +-
 18 files changed, 664 insertions(+), 266 deletions(-)

diff --git a/e2e/dashboard.spec.ts b/e2e/dashboard.spec.ts
index 669306c7..79dba6b7 100644
--- a/e2e/dashboard.spec.ts
+++ b/e2e/dashboard.spec.ts
@@ -8,7 +8,12 @@ import {
     startOrStopTimerWithButton,
     stoppedTimeEntryResponse,
 } from './utils/currentTimeEntry';
-import { createBareTimeEntryViaApi } from './utils/api';
+import {
+    createBareTimeEntryViaApi,
+    createPublicProjectViaApi,
+    createTimeEntryViaApi,
+    updateOrganizationSettingViaApi,
+} from './utils/api';
 
 async function goToDashboard(page: Page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
@@ -116,4 +121,70 @@ test.describe('Employee Dashboard Restrictions', () => {
         // Team Activity should NOT be visible for employees
         await expect(employee.page.getByText('Team Activity', { exact: true })).not.toBeVisible();
     });
+
+    test('employee cannot see Cost column in This Week table by default', async ({
+        ctx,
+        employee,
+    }) => {
+        const project = await createPublicProjectViaApi(ctx, {
+            name: 'EmpDashBillProj',
+            is_billable: true,
+            billable_rate: 10000,
+        });
+        await createTimeEntryViaApi(
+            { ...ctx, memberId: employee.memberId },
+            {
+                description: 'Emp dashboard cost entry',
+                duration: '1h',
+                projectId: project.id,
+                billable: true,
+            }
+        );
+
+        await employee.page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
+        await expect(employee.page.getByTestId('dashboard_view')).toBeVisible({
+            timeout: 10000,
+        });
+
+        // This Week table should be visible
+        await expect(employee.page.getByText('This Week', { exact: true })).toBeVisible();
+
+        // Duration column should be visible, but Cost column should NOT
+        await expect(employee.page.getByText('Duration', { exact: true })).toBeVisible();
+        await expect(employee.page.getByText('Cost', { exact: true })).not.toBeVisible();
+    });
+
+    test('employee can see Cost column in This Week table when employees_can_see_billable_rates is enabled', async ({
+        ctx,
+        employee,
+    }) => {
+        await updateOrganizationSettingViaApi(ctx, { employees_can_see_billable_rates: true });
+
+        const project = await createPublicProjectViaApi(ctx, {
+            name: 'EmpDashBillVisProj',
+            is_billable: true,
+            billable_rate: 10000,
+        });
+        await createTimeEntryViaApi(
+            { ...ctx, memberId: employee.memberId },
+            {
+                description: 'Emp dashboard cost visible entry',
+                duration: '1h',
+                projectId: project.id,
+                billable: true,
+            }
+        );
+
+        await employee.page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
+        await expect(employee.page.getByTestId('dashboard_view')).toBeVisible({
+            timeout: 10000,
+        });
+
+        // Both Duration and Cost columns should be visible
+        await expect(employee.page.getByText('Duration', { exact: true })).toBeVisible();
+        await expect(employee.page.getByText('Cost', { exact: true })).toBeVisible();
+
+        // 1h at 100.00/h = 100.00 EUR cost should be visible
+        await expect(employee.page.getByText('100,00 EUR').first()).toBeVisible();
+    });
 });
diff --git a/e2e/projects.spec.ts b/e2e/projects.spec.ts
index 92e35fa4..bc0f97b2 100644
--- a/e2e/projects.spec.ts
+++ b/e2e/projects.spec.ts
@@ -124,8 +124,15 @@ test('test that updating billable rate works with existing time entries', async
 
     await page.getByRole('row').first().getByRole('button').click();
     await page.getByRole('menuitem').getByText('Edit').first().click();
-    await page.getByText('Non-Billable').click();
-    await page.getByText('Custom Rate').click();
+
+    // Set billable default to Billable
+    await page.getByRole('dialog').locator('#billable').click();
+    await page.getByRole('option', { name: 'Billable', exact: true }).click();
+
+    // Set billable rate to Custom Rate
+    await page.getByRole('dialog').locator('#billableRateType').click();
+    await page.getByRole('option', { name: 'Custom Rate' }).click();
+
     await page.getByPlaceholder('Billable Rate').fill(newBillableRate.toString());
     await page.getByRole('button', { name: 'Update Project' }).click();
 
@@ -153,6 +160,180 @@ test('test that updating billable rate works with existing time entries', async
     ).toBeVisible();
 });
 
+test('test that creating a project with default billable rate works', async ({ page }) => {
+    const newProjectName = 'Default Rate Project ' + Math.floor(1 + Math.random() * 10000);
+    await goToProjectsOverview(page);
+    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByLabel('Project Name').fill(newProjectName);
+
+    // Set billable default to Billable (leaves rate type as Default Rate)
+    await page.getByRole('dialog').locator('#billable').click();
+    await page.getByRole('option', { name: 'Billable', exact: true }).click();
+
+    // Verify rate type is "Default Rate" and the rate input is disabled
+    await expect(page.getByRole('dialog').locator('#billableRateType')).toContainText(
+        'Default Rate'
+    );
+    await expect(page.getByPlaceholder('Billable Rate')).toBeDisabled();
+
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201 &&
+                (await response.json()).data.is_billable === true &&
+                (await response.json()).data.billable_rate === null
+        ),
+    ]);
+
+    await expect(page.getByTestId('project_table')).toContainText(newProjectName);
+});
+
+test('test that creating a non-billable project works', async ({ page }) => {
+    const newProjectName = 'Non-Billable Project ' + Math.floor(1 + Math.random() * 10000);
+    await goToProjectsOverview(page);
+    await page.getByRole('button', { name: 'Create Project' }).click();
+    await page.getByLabel('Project Name').fill(newProjectName);
+
+    // Billable default should already be "Non-billable" by default
+    await expect(page.getByRole('dialog').locator('#billable')).toContainText('Non-billable');
+
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201 &&
+                (await response.json()).data.is_billable === false &&
+                (await response.json()).data.billable_rate === null
+        ),
+    ]);
+
+    await expect(page.getByTestId('project_table')).toContainText(newProjectName);
+});
+
+test('test that switching from custom rate to default rate clears billable rate', async ({
+    page,
+    ctx,
+}) => {
+    const newProjectName = 'Rate Switch Project ' + Math.floor(1 + Math.random() * 10000);
+    // Create a project with an existing custom billable rate
+    await createProjectViaApi(ctx, {
+        name: newProjectName,
+        is_billable: true,
+        billable_rate: 15000,
+    });
+
+    await goToProjectsOverview(page);
+    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
+
+    await page.getByRole('row').first().getByRole('button').click();
+    await page.getByRole('menuitem').getByText('Edit').first().click();
+
+    // Verify it loaded as Billable with Custom Rate
+    await expect(page.getByRole('dialog').locator('#billable')).toContainText('Billable');
+    await expect(page.getByRole('dialog').locator('#billableRateType')).toContainText(
+        'Custom Rate'
+    );
+
+    // Switch to Default Rate
+    await page.getByRole('dialog').locator('#billableRateType').click();
+    await page.getByRole('option', { name: 'Default Rate' }).click();
+
+    // Rate input should now be disabled
+    await expect(page.getByPlaceholder('Billable Rate')).toBeDisabled();
+
+    // Submit — billable_rate changes from 15000 to null, so confirmation dialog appears
+    await page.getByRole('button', { name: 'Update Project' }).click();
+    await Promise.all([
+        page.locator('button').filter({ hasText: 'Yes, update existing time' }).click(),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/projects/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200 &&
+                (await response.json()).data.is_billable === true &&
+                (await response.json()).data.billable_rate === null
+        ),
+    ]);
+});
+
+test('test that switching from billable to non-billable preserves rate settings', async ({
+    page,
+    ctx,
+}) => {
+    const newProjectName = 'Billable Reset Project ' + Math.floor(1 + Math.random() * 10000);
+    // Create a project with a custom billable rate
+    await createProjectViaApi(ctx, {
+        name: newProjectName,
+        is_billable: true,
+        billable_rate: 20000,
+    });
+
+    await goToProjectsOverview(page);
+    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
+
+    await page.getByRole('row').first().getByRole('button').click();
+    await page.getByRole('menuitem').getByText('Edit').first().click();
+
+    // Verify it loaded correctly as Billable with Custom Rate
+    await expect(page.getByRole('dialog').locator('#billable')).toContainText('Billable');
+    await expect(page.getByRole('dialog').locator('#billableRateType')).toContainText(
+        'Custom Rate'
+    );
+
+    // Switch to Non-billable
+    await page.getByRole('dialog').locator('#billable').click();
+    await page.getByRole('option', { name: 'Non-billable' }).click();
+
+    // Rate type should still be Custom Rate (not reset)
+    await expect(page.getByRole('dialog').locator('#billableRateType')).toContainText(
+        'Custom Rate'
+    );
+
+    // Submit and verify project is non-billable but keeps its custom rate
+    await Promise.all([
+        page.getByRole('button', { name: 'Update Project' }).click(),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/projects/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200 &&
+                (await response.json()).data.is_billable === false &&
+                (await response.json()).data.billable_rate === 20000
+        ),
+    ]);
+});
+
+test('test that editing an existing billable project with default rate loads correctly', async ({
+    page,
+    ctx,
+}) => {
+    const newProjectName = 'Default Rate Edit Project ' + Math.floor(1 + Math.random() * 10000);
+    // Create a project that is billable but has no custom rate (= default rate)
+    await createProjectViaApi(ctx, {
+        name: newProjectName,
+        is_billable: true,
+        billable_rate: null,
+    });
+
+    await goToProjectsOverview(page);
+    await expect(page.getByText(newProjectName)).toBeVisible({ timeout: 10000 });
+
+    await page.getByRole('row').first().getByRole('button').click();
+    await page.getByRole('menuitem').getByText('Edit').first().click();
+
+    // Verify it loaded as Billable with Default Rate
+    await expect(page.getByRole('dialog').locator('#billable')).toContainText('Billable');
+    await expect(page.getByRole('dialog').locator('#billableRateType')).toContainText(
+        'Default Rate'
+    );
+    await expect(page.getByPlaceholder('Billable Rate')).toBeDisabled();
+});
+
 // Sorting tests
 test('test that sorting projects by name works', async ({ page }) => {
     await goToProjectsOverview(page);
@@ -296,8 +477,15 @@ test('test that custom billable rate is displayed correctly on project detail pa
     // Edit the project to set a custom billable rate
     await page.getByRole('row').first().getByRole('button').click();
     await page.getByRole('menuitem').getByText('Edit').first().click();
-    await page.getByText('Non-Billable').click();
-    await page.getByText('Custom Rate').click();
+
+    // Set billable default to Billable
+    await page.getByRole('dialog').locator('#billable').click();
+    await page.getByRole('option', { name: 'Billable', exact: true }).click();
+
+    // Set billable rate to Custom Rate
+    await page.getByRole('dialog').locator('#billableRateType').click();
+    await page.getByRole('option', { name: 'Custom Rate' }).click();
+
     await page.getByPlaceholder('Billable Rate').fill(newBillableRate.toString());
     await page.getByRole('button', { name: 'Update Project' }).click();
 
diff --git a/e2e/tasks.spec.ts b/e2e/tasks.spec.ts
index 69ef358b..d8abdf53 100644
--- a/e2e/tasks.spec.ts
+++ b/e2e/tasks.spec.ts
@@ -195,6 +195,69 @@ test('test that multiple tasks are displayed on project detail page', async ({ p
     await expect(page.getByText(taskName2)).toBeVisible();
 });
 
+test('test that creating a new project from the task create modal project dropdown works', async ({
+    page,
+    ctx,
+}) => {
+    const existingProjectName = 'Existing Project ' + Math.floor(1 + Math.random() * 10000);
+    const newProjectName = 'Dropdown Created Project ' + Math.floor(1 + Math.random() * 10000);
+    const newTaskName = 'Task With New Project ' + Math.floor(1 + Math.random() * 10000);
+
+    const project = await createProjectViaApi(ctx, { name: existingProjectName });
+    await page.goto(PLAYWRIGHT_BASE_URL + '/projects/' + project.id);
+
+    // Open the Create Task modal
+    await page.getByRole('button', { name: 'Create Task' }).click();
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await page.getByPlaceholder('Task Name').fill(newTaskName);
+
+    // Open the project dropdown (it should show the current project)
+    await page.getByRole('dialog').getByRole('button', { name: existingProjectName }).click();
+
+    // Click "Create new Project" at the bottom of the dropdown
+    await page.getByText('Create new Project').click();
+
+    // The ProjectCreateModal should appear
+    await expect(page.getByLabel('Project name')).toBeVisible();
+    await page.getByLabel('Project name').fill(newProjectName);
+
+    // Submit the project creation
+    await Promise.all([
+        page.getByRole('button', { name: 'Create Project' }).click(),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/projects') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201 &&
+                (await response.json()).data.name === newProjectName
+        ),
+    ]);
+
+    // The project dropdown trigger should now show the new project name
+    await expect(
+        page.getByRole('dialog').getByRole('button', { name: newProjectName })
+    ).toBeVisible();
+
+    // Submit the task and capture the response to get the new project ID
+    const [taskResponse] = await Promise.all([
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/tasks') &&
+                response.request().method() === 'POST' &&
+                response.status() === 201 &&
+                (await response.json()).data.name === newTaskName
+        ),
+        page.getByRole('button', { name: 'Create Task' }).click(),
+    ]);
+
+    const taskData = await taskResponse.json();
+    const newProjectId = taskData.data.project_id;
+
+    // Navigate to the new project's page and verify the task is there
+    await page.goto(PLAYWRIGHT_BASE_URL + '/projects/' + newProjectId);
+    await expect(page.getByTestId('task_table')).toContainText(newTaskName);
+});
+
 // =============================================
 // Employee Permission Tests
 // =============================================
diff --git a/resources/js/Components/Common/Project/ProjectDropdown.vue b/resources/js/Components/Common/Project/ProjectDropdown.vue
index 1a43d475..28c78853 100644
--- a/resources/js/Components/Common/Project/ProjectDropdown.vue
+++ b/resources/js/Components/Common/Project/ProjectDropdown.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import ProjectBadge from '@/packages/ui/src/Project/ProjectBadge.vue';
 import { computed, nextTick, ref, watch } from 'vue';
 import { useProjectsQuery } from '@/utils/useProjectsQuery';
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
@@ -11,13 +10,16 @@ import {
     ComboboxRoot,
     ComboboxViewport,
 } from 'radix-vue';
-import { PlusCircleIcon } from '@heroicons/vue/20/solid';
-import { api } from '@/packages/api/src';
-import { usePage } from '@inertiajs/vue3';
-import { getRandomColor } from '@/packages/ui/src/utils/color';
-import type { Project } from '@/packages/api/src';
-import ProjectDropdownItem from '@/packages/ui/src/Project/ProjectDropdownItem.vue';
+import { Check, Plus } from 'lucide-vue-next';
+import type { CreateClientBody, CreateProjectBody, Project } from '@/packages/api/src';
 import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
+import ProjectCreateModal from '@/packages/ui/src/Project/ProjectCreateModal.vue';
+import { useProjectsStore } from '@/utils/useProjects';
+import { useClientsStore } from '@/utils/useClients';
+import { useClientsQuery } from '@/utils/useClientsQuery';
+import { getOrganizationCurrencyString } from '@/utils/money';
+import { isAllowedToPerformPremiumAction } from '@/utils/billing';
+import { canCreateProjects } from '@/utils/permissions';
 
 const searchValue = ref('');
 const searchInput = ref<HTMLElement | null>(null);
@@ -25,10 +27,13 @@ const model = defineModel<string | null>({
     default: null,
 });
 const open = ref(false);
-const { projects, invalidateProjects } = useProjectsQuery();
+const showCreateProject = ref(false);
+const { projects } = useProjectsQuery();
+const { clients } = useClientsQuery();
 const emit = defineEmits(['update:modelValue', 'changed']);
 
-const projectDropdownTrigger = ref<HTMLElement | null>(null);
+const activeClients = computed(() => clients.value.filter((c) => !c.is_archived));
+
 const sortedProjects = ref<Project[]>([]);
 
 const shownProjects = computed(() => {
@@ -37,38 +42,17 @@ const shownProjects = computed(() => {
     });
 });
 
-withDefaults(
-    defineProps<{
-        border?: boolean;
-    }>(),
-    {
-        border: true,
+async function handleCreateProject(projectBody: CreateProjectBody) {
+    const newProject = await useProjectsStore().createProject(projectBody);
+    if (newProject) {
+        model.value = newProject.id;
+        emit('changed');
     }
-);
+    return newProject;
+}
 
-const page = usePage<{
-    auth: {
-        user: {
-            current_team_id: string;
-        };
-    };
-}>();
-
-async function addProjectIfNoneExists() {
-    if (searchValue.value.length > 0 && shownProjects.value.length === 0) {
-        const response = await api.createProject(
-            {
-                name: searchValue.value,
-                color: getRandomColor(),
-                is_billable: false,
-            },
-            { params: { organization: page.props.auth.user.current_team_id } }
-        );
-        invalidateProjects();
-        model.value = response.data.id;
-        searchValue.value = '';
-        open.value = false;
-    }
+async function handleCreateClient(clientBody: CreateClientBody) {
+    return await useClientsStore().createClient(clientBody);
 }
 
 watch(open, (isOpen) => {
@@ -107,16 +91,12 @@ function updateValue(project: Project) {
 </script>
 
 <template>
-    <Dropdown v-model="open" align="start" width="60">
+    <Dropdown v-model="open" align="start">
         <template #trigger>
-            <ProjectBadge
-                ref="projectDropdownTrigger"
-                :color="selectedProjectColor"
-                size="xlarge"
-                :border
-                tag="button"
-                :name="selectedProjectName"
-                class="focus:border-input-border-active bg-input-background focus:outline-0 focus:bg-card-background-separator hover:bg-card-background-separator"></ProjectBadge>
+            <slot
+                name="trigger"
+                :selected-project-name="selectedProjectName"
+                :selected-project-color="selectedProjectColor"></slot>
         </template>
 
         <template #content>
@@ -130,40 +110,53 @@ function updateValue(project: Project) {
                     <ComboboxAnchor>
                         <ComboboxInput
                             ref="searchInput"
-                            class="bg-card-background border-0 placeholder-text-tertiary text-sm text-text-primary py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
-                            placeholder="Search for a project..."
-                            @keydown.enter="addProjectIfNoneExists" />
+                            class="bg-transparent border-0 placeholder-muted-foreground text-sm text-popover-foreground py-2 px-3 focus:ring-0 border-b border-popover-border focus:border-popover-border w-full"
+                            placeholder="Search for a project..." />
                     </ComboboxAnchor>
                     <ComboboxContent>
                         <ComboboxViewport
-                            ref="dropdownViewport"
-                            class="w-60 max-h-60 overflow-y-scroll">
+                            class="w-[--reka-popper-anchor-width] max-h-60 overflow-y-scroll p-1">
                             <ComboboxItem
                                 v-for="project in shownProjects"
                                 :key="project.id"
                                 :value="project"
-                                class="data-[highlighted]:bg-card-background-active"
+                                class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground"
                                 :data-project-id="project.id">
-                                <ProjectDropdownItem
-                                    :selected="isProjectSelected(project)"
-                                    :color="project.color"
-                                    :name="project.name"></ProjectDropdownItem>
+                                <span class="flex items-center gap-2">
+                                    <span
+                                        :style="{ backgroundColor: project.color }"
+                                        class="w-3 h-3 rounded-full shrink-0"></span>
+                                    <span>{{ project.name }}</span>
+                                </span>
+                                <span
+                                    v-if="isProjectSelected(project)"
+                                    class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+                                    <Check class="h-4 w-4" />
+                                </span>
                             </ComboboxItem>
-                            <div
-                                v-if="searchValue.length > 0 && shownProjects.length === 0"
-                                class="bg-card-background-active">
-                                <div
-                                    class="flex space-x-3 items-center px-4 py-3 text-xs font-medium border-t rounded-b-lg border-card-background-separator">
-                                    <PlusCircleIcon class="w-5 flex-shrink-0"></PlusCircleIcon>
-                                    <span>Add "{{ searchValue }}" as a new Project</span>
-                                </div>
-                            </div>
                         </ComboboxViewport>
+                        <div
+                            v-if="canCreateProjects()"
+                            class="flex items-center gap-2 px-3 py-2 text-sm cursor-pointer hover:bg-accent hover:text-accent-foreground border-t border-popover-border"
+                            @click="
+                                open = false;
+                                showCreateProject = true;
+                            ">
+                            <Plus class="h-4 w-4 shrink-0" />
+                            <span>Create new Project</span>
+                        </div>
                     </ComboboxContent>
                 </ComboboxRoot>
             </UseFocusTrap>
         </template>
     </Dropdown>
+    <ProjectCreateModal
+        v-model:show="showCreateProject"
+        :create-project="handleCreateProject"
+        :create-client="handleCreateClient"
+        :clients="activeClients"
+        :currency="getOrganizationCurrencyString()"
+        :enable-estimated-time="isAllowedToPerformPremiumAction()" />
 </template>
 
 <style scoped></style>
diff --git a/resources/js/Components/Common/Project/ProjectEditModal.vue b/resources/js/Components/Common/Project/ProjectEditModal.vue
index 2be30f91..725bc2e4 100644
--- a/resources/js/Components/Common/Project/ProjectEditModal.vue
+++ b/resources/js/Components/Common/Project/ProjectEditModal.vue
@@ -9,12 +9,13 @@ import { useProjectsStore } from '@/utils/useProjects';
 import { useClientsStore } from '@/utils/useClients';
 import { useFocus } from '@vueuse/core';
 import ClientDropdown from '@/packages/ui/src/Client/ClientDropdown.vue';
-import Badge from '@/packages/ui/src/Badge.vue';
 import { useClientsQuery } from '@/utils/useClientsQuery';
 import ProjectColorSelector from '@/packages/ui/src/Project/ProjectColorSelector.vue';
+import { Button } from '@/packages/ui/src/Buttons';
+import { ChevronDown } from 'lucide-vue-next';
 import { UserCircleIcon } from '@heroicons/vue/20/solid';
 import EstimatedTimeSection from '@/packages/ui/src/EstimatedTimeSection.vue';
-import { Field, FieldLabel } from '@/packages/ui/src/field';
+import { Field, FieldGroup, FieldLabel } from '@/packages/ui/src/field';
 import ProjectBillableRateModal from '@/packages/ui/src/Project/ProjectBillableRateModal.vue';
 import { getOrganizationCurrencyString } from '@/utils/money';
 import ProjectEditBillableSection from '@/packages/ui/src/Project/ProjectEditBillableSection.vue';
@@ -81,59 +82,47 @@ async function submitBillableRate() {
         </template>
 
         <template #content>
-            <div class="sm:flex items-center space-y-2 sm:space-y-0 sm:space-x-5">
-                <Field class="flex-1 flex items-center">
-                    <div class="text-center">
+            <FieldGroup>
+                <FieldGroup class="flex-row items-end">
+                    <Field class="w-auto text-center">
                         <FieldLabel for="color">Color</FieldLabel>
                         <ProjectColorSelector v-model="project.color"></ProjectColorSelector>
-                    </div>
-                </Field>
-                <Field class="w-full">
-                    <FieldLabel for="projectName">Project name</FieldLabel>
-                    <TextInput
-                        id="projectName"
-                        ref="projectNameInput"
-                        v-model="project.name"
-                        type="text"
-                        placeholder="Project Name"
-                        class="block w-full"
-                        required
-                        autocomplete="projectName"
-                        @keydown.enter="submit()" />
-                </Field>
+                    </Field>
+                    <Field class="w-full">
+                        <FieldLabel for="projectName">Project name</FieldLabel>
+                        <TextInput
+                            id="projectName"
+                            ref="projectNameInput"
+                            v-model="project.name"
+                            type="text"
+                            placeholder="Project Name"
+                            class="block w-full"
+                            required
+                            autocomplete="projectName"
+                            @keydown.enter="submit()" />
+                    </Field>
+                </FieldGroup>
                 <Field>
-                    <FieldLabel for="client">Client</FieldLabel>
+                    <FieldLabel for="client" :icon="UserCircleIcon">Client</FieldLabel>
                     <ClientDropdown v-model="project.client_id" :create-client :clients="clients">
                         <template #trigger>
-                            <Badge
-                                class="bg-input-background cursor-pointer hover:bg-tertiary"
-                                size="xlarge">
-                                <div class="flex items-center space-x-2">
-                                    <UserCircleIcon class="w-5 text-icon-default"></UserCircleIcon>
-                                    <span class="whitespace-nowrap">
-                                        {{ currentClientName }}
-                                    </span>
-                                </div>
-                            </Badge>
+                            <Button variant="input" class="w-full justify-between">
+                                <span class="truncate">{{ currentClientName }}</span>
+                                <ChevronDown class="w-4 h-4 text-icon-default" />
+                            </Button>
                         </template>
                     </ClientDropdown>
                 </Field>
-            </div>
-            <div>
-                <div>
-                    <ProjectEditBillableSection
-                        v-model:is-billable="project.is_billable"
-                        v-model:billable-rate="project.billable_rate"
-                        :currency="getOrganizationCurrencyString()"
-                        @submit="submit"></ProjectEditBillableSection>
-                </div>
-                <div>
-                    <EstimatedTimeSection
-                        v-if="isAllowedToPerformPremiumAction()"
-                        v-model="project.estimated_time"
-                        @submit="submit()"></EstimatedTimeSection>
-                </div>
-            </div>
+                <ProjectEditBillableSection
+                    v-model:is-billable="project.is_billable"
+                    v-model:billable-rate="project.billable_rate"
+                    :currency="getOrganizationCurrencyString()"
+                    @submit="submit"></ProjectEditBillableSection>
+                <EstimatedTimeSection
+                    v-if="isAllowedToPerformPremiumAction()"
+                    v-model="project.estimated_time"
+                    @submit="submit()"></EstimatedTimeSection>
+            </FieldGroup>
         </template>
         <template #footer>
             <SecondaryButton @click="show = false"> Cancel</SecondaryButton>
diff --git a/resources/js/Components/Common/Reporting/ReportingOverview.vue b/resources/js/Components/Common/Reporting/ReportingOverview.vue
index 13853f00..e564c8a8 100644
--- a/resources/js/Components/Common/Reporting/ReportingOverview.vue
+++ b/resources/js/Components/Common/Reporting/ReportingOverview.vue
@@ -292,7 +292,9 @@ const tableData = computed(() => {
                     <div
                         class="contents [&>*]:border-card-background-separator [&>*]:border-b [&>*]:bg-secondary [&>*]:pb-1.5 [&>*]:pt-1 text-text-tertiary text-sm">
                         <div class="pl-6">Name</div>
-                        <div class="text-right">Duration</div>
+                        <div class="text-right" :class="!showBillableRate ? 'pr-6' : ''">
+                            Duration
+                        </div>
                         <div v-if="showBillableRate" class="text-right pr-6">Cost</div>
                     </div>
                     <template
@@ -311,7 +313,9 @@ const tableData = computed(() => {
                             <div class="flex items-center pl-6 font-medium">
                                 <span>Total</span>
                             </div>
-                            <div class="justify-end flex items-center font-medium">
+                            <div
+                                class="justify-end flex items-center font-medium"
+                                :class="!showBillableRate ? 'pr-6' : ''">
                                 {{
                                     formatHumanReadableDuration(
                                         aggregatedTableTimeEntries.seconds,
@@ -324,7 +328,8 @@ const tableData = computed(() => {
                                 v-if="showBillableRate"
                                 class="justify-end pr-6 flex items-center font-medium">
                                 {{
-                                    aggregatedTableTimeEntries.cost
+                                    aggregatedTableTimeEntries.cost !== null &&
+                                    aggregatedTableTimeEntries.cost !== undefined
                                         ? formatCents(
                                               aggregatedTableTimeEntries.cost,
                                               getOrganizationCurrencyString(),
diff --git a/resources/js/Components/Common/Reporting/ReportingRow.vue b/resources/js/Components/Common/Reporting/ReportingRow.vue
index 194f034f..26b24b1c 100644
--- a/resources/js/Components/Common/Reporting/ReportingRow.vue
+++ b/resources/js/Components/Common/Reporting/ReportingRow.vue
@@ -42,7 +42,7 @@ const organization = inject<ComputedRef<Organization>>('organization');
                 {{ entry.description }}
             </span>
         </div>
-        <div class="justify-end flex items-center">
+        <div class="justify-end flex items-center" :class="!showCost ? 'pr-6' : ''">
             {{
                 formatHumanReadableDuration(
                     entry.seconds,
diff --git a/resources/js/Components/Common/Task/TaskCreateModal.vue b/resources/js/Components/Common/Task/TaskCreateModal.vue
index d4fe216d..b82ce37b 100644
--- a/resources/js/Components/Common/Task/TaskCreateModal.vue
+++ b/resources/js/Components/Common/Task/TaskCreateModal.vue
@@ -9,6 +9,10 @@ import { useTasksStore } from '@/utils/useTasks';
 import ProjectDropdown from '@/Components/Common/Project/ProjectDropdown.vue';
 import EstimatedTimeSection from '@/packages/ui/src/EstimatedTimeSection.vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
+import { Field, FieldGroup, FieldLabel } from '@/packages/ui/src/field';
+import { Button } from '@/packages/ui/src/Buttons';
+import { ChevronDown } from 'lucide-vue-next';
+import { FolderIcon } from '@heroicons/vue/20/solid';
 
 const { createTask } = useTasksStore();
 const show = defineModel('show', { default: false });
@@ -54,8 +58,9 @@ useFocus(taskNameInput, { initialValue: true });
         </template>
 
         <template #content>
-            <div class="flex items-center space-x-4">
-                <div class="col-span-6 sm:col-span-4 flex-1">
+            <FieldGroup>
+                <Field class="w-full">
+                    <FieldLabel for="taskName">Task name</FieldLabel>
                     <TextInput
                         id="taskName"
                         ref="taskNameInput"
@@ -66,15 +71,28 @@ useFocus(taskNameInput, { initialValue: true });
                         required
                         autocomplete="taskName"
                         @keydown.enter="submit()" />
-                </div>
-                <div class="col-span-6 sm:col-span-4">
-                    <ProjectDropdown v-model="taskProjectId"></ProjectDropdown>
-                </div>
-            </div>
-            <EstimatedTimeSection
-                v-if="isAllowedToPerformPremiumAction()"
-                v-model="estimatedTime"
-                @submit="submit()"></EstimatedTimeSection>
+                </Field>
+                <Field class="w-auto">
+                    <FieldLabel :icon="FolderIcon" for="project">Project</FieldLabel>
+                    <ProjectDropdown v-model="taskProjectId">
+                        <template #trigger="{ selectedProjectName, selectedProjectColor }">
+                            <Button variant="input" class="w-full justify-between">
+                                <span class="flex items-center gap-2 truncate">
+                                    <span
+                                        :style="{ backgroundColor: selectedProjectColor }"
+                                        class="w-3 h-3 rounded-full shrink-0"></span>
+                                    <span class="truncate">{{ selectedProjectName }}</span>
+                                </span>
+                                <ChevronDown class="w-4 h-4 text-icon-default" />
+                            </Button>
+                        </template>
+                    </ProjectDropdown>
+                </Field>
+                <EstimatedTimeSection
+                    v-if="isAllowedToPerformPremiumAction()"
+                    v-model="estimatedTime"
+                    @submit="submit()"></EstimatedTimeSection>
+            </FieldGroup>
         </template>
         <template #footer>
             <SecondaryButton @click="show = false"> Cancel </SecondaryButton>
diff --git a/resources/js/Components/Common/Task/TaskEditModal.vue b/resources/js/Components/Common/Task/TaskEditModal.vue
index 9e7f9ad2..4432df2c 100644
--- a/resources/js/Components/Common/Task/TaskEditModal.vue
+++ b/resources/js/Components/Common/Task/TaskEditModal.vue
@@ -9,6 +9,7 @@ import { useTasksStore } from '@/utils/useTasks';
 import type { Task, UpdateTaskBody } from '@/packages/api/src';
 import EstimatedTimeSection from '@/packages/ui/src/EstimatedTimeSection.vue';
 import { isAllowedToPerformPremiumAction } from '@/utils/billing';
+import { Field, FieldGroup, FieldLabel } from '@/packages/ui/src/field';
 
 const { updateTask } = useTasksStore();
 const show = defineModel('show', { default: false });
@@ -42,24 +43,25 @@ useFocus(taskNameInput, { initialValue: true });
         </template>
 
         <template #content>
-            <div class="flex items-center space-x-4">
-                <div class="col-span-6 sm:col-span-4 flex-1">
+            <FieldGroup>
+                <Field>
+                    <FieldLabel for="taskName">Task name</FieldLabel>
                     <TextInput
                         id="taskName"
                         ref="taskNameInput"
                         v-model="taskBody.name"
                         type="text"
                         placeholder="Task Name"
-                        class="mt-1 block w-full"
+                        class="block w-full"
                         required
                         autocomplete="taskName"
                         @keydown.enter="submit()" />
-                </div>
-            </div>
-            <EstimatedTimeSection
-                v-if="isAllowedToPerformPremiumAction()"
-                v-model="taskBody.estimated_time"
-                @submit="submit()"></EstimatedTimeSection>
+                </Field>
+                <EstimatedTimeSection
+                    v-if="isAllowedToPerformPremiumAction()"
+                    v-model="taskBody.estimated_time"
+                    @submit="submit()"></EstimatedTimeSection>
+            </FieldGroup>
         </template>
         <template #footer>
             <SecondaryButton @click="show = false"> Cancel </SecondaryButton>
diff --git a/resources/js/Components/Dashboard/ThisWeekReportingTable.vue b/resources/js/Components/Dashboard/ThisWeekReportingTable.vue
index 0da6f07a..b1f3a368 100644
--- a/resources/js/Components/Dashboard/ThisWeekReportingTable.vue
+++ b/resources/js/Components/Dashboard/ThisWeekReportingTable.vue
@@ -114,6 +114,12 @@ const tableData = computed(() => {
         }) ?? []
     );
 });
+
+const showBillableRate = computed(() => {
+    return !!(
+        getCurrentRole() !== 'employee' || organization?.value?.employees_can_see_billable_rates
+    );
+});
 </script>
 
 <template>
@@ -132,15 +138,20 @@ const tableData = computed(() => {
                 "></ReportingGroupBySelect>
         </div>
 
-        <div class="grid items-center" style="grid-template-columns: 1fr 100px 150px">
+        <div
+            class="grid items-center"
+            :style="`grid-template-columns: 1fr 100px ${showBillableRate ? '150px' : ''}`">
             <div
                 class="contents [&>*]:border-card-background-separator [&>*]:border-b [&>*]:pb-1.5 [&>*]:pt-1 text-text-tertiary text-sm">
                 <div class="pl-6">Name</div>
-                <div class="text-right">Duration</div>
-                <div class="text-right pr-6">Cost</div>
+                <div class="text-right" :class="!showBillableRate ? 'pr-6' : ''">Duration</div>
+                <div v-if="showBillableRate" class="text-right pr-6">Cost</div>
             </div>
 
-            <div v-if="isLoading" class="flex justify-center py-10 col-span-3 text-text-tertiary">
+            <div
+                v-if="isLoading"
+                class="flex justify-center py-10 text-text-tertiary"
+                :class="showBillableRate ? 'col-span-3' : 'col-span-2'">
                 Loading reporting data…
             </div>
 
@@ -153,12 +164,15 @@ const tableData = computed(() => {
                     v-for="entry in tableData"
                     :key="entry.description ?? 'none'"
                     :currency="getOrganizationCurrencyString()"
+                    :show-cost="showBillableRate"
                     :entry="entry"></ReportingRow>
                 <div class="contents [&>*]:transition text-text-tertiary [&>*]:h-[50px]">
                     <div class="flex items-center pl-6 font-medium">
                         <span>Total</span>
                     </div>
-                    <div class="justify-end flex items-center font-medium">
+                    <div
+                        class="justify-end flex items-center font-medium"
+                        :class="!showBillableRate ? 'pr-6' : ''">
                         {{
                             formatHumanReadableDuration(
                                 aggregatedTableTimeEntries.seconds,
@@ -167,7 +181,9 @@ const tableData = computed(() => {
                             )
                         }}
                     </div>
-                    <div class="justify-end pr-6 flex items-center font-medium">
+                    <div
+                        v-if="showBillableRate"
+                        class="justify-end pr-6 flex items-center font-medium">
                         {{
                             aggregatedTableTimeEntries.cost
                                 ? formatCents(
@@ -183,7 +199,10 @@ const tableData = computed(() => {
                 </div>
             </template>
 
-            <div v-else class="chart flex flex-col items-center justify-center py-12 col-span-3">
+            <div
+                v-else
+                class="chart flex flex-col items-center justify-center py-12"
+                :class="showBillableRate ? 'col-span-3' : 'col-span-2'">
                 <p class="text-lg text-text-primary font-medium">No time entries found</p>
                 <p>Try to track some time entries this week</p>
             </div>
diff --git a/resources/js/packages/ui/src/Client/ClientDropdown.vue b/resources/js/packages/ui/src/Client/ClientDropdown.vue
index 0cee73bc..ae033bd5 100644
--- a/resources/js/packages/ui/src/Client/ClientDropdown.vue
+++ b/resources/js/packages/ui/src/Client/ClientDropdown.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
-import { PlusCircleIcon } from '@heroicons/vue/20/solid';
 import { computed, nextTick, ref, watch } from 'vue';
-import ClientDropdownItem from '@/packages/ui/src/Client/ClientDropdownItem.vue';
 import type { CreateClientBody, Client } from '@/packages/api/src';
 import {
     ComboboxAnchor,
@@ -13,6 +11,7 @@ import {
 } from 'radix-vue';
 import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component';
 import Dropdown from '@/packages/ui/src/Input/Dropdown.vue';
+import { Check, Plus } from 'lucide-vue-next';
 
 const model = defineModel<string | null>({
     default: null,
@@ -77,7 +76,7 @@ function updateValue(client: { id: string | null; name: string }) {
 </script>
 
 <template>
-    <Dropdown v-model="open" align="start" width="60">
+    <Dropdown v-model="open" align="start">
         <template #trigger>
             <slot name="trigger"></slot>
         </template>
@@ -92,35 +91,41 @@ function updateValue(client: { id: string | null; name: string }) {
                     <ComboboxAnchor>
                         <ComboboxInput
                             ref="searchInput"
-                            class="bg-card-background border-0 placeholder-text-tertiary text-sm text-text-primary py-2.5 focus:ring-0 border-b border-card-background-separator focus:border-card-background-separator w-full"
+                            class="bg-transparent border-0 placeholder-muted-foreground text-sm text-popover-foreground py-2 px-3 focus:ring-0 border-b border-popover-border focus:border-popover-border w-full"
                             placeholder="Search for a client..." />
                     </ComboboxAnchor>
                     <ComboboxContent>
-                        <ComboboxViewport class="w-60 max-h-60 overflow-y-scroll">
+                        <ComboboxViewport
+                            class="w-[--reka-popper-anchor-width] max-h-60 overflow-y-scroll p-1">
                             <ComboboxItem
                                 :value="{ id: null, name: 'No Client' }"
-                                class="data-[highlighted]:bg-card-background-active">
-                                <ClientDropdownItem :selected="model === null" name="No Client" />
+                                class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground">
+                                <span>No Client</span>
+                                <span
+                                    v-if="model === null"
+                                    class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+                                    <Check class="h-4 w-4" />
+                                </span>
                             </ComboboxItem>
                             <ComboboxItem
                                 v-for="client in filteredClients"
                                 :key="client.id"
                                 :value="client"
-                                class="data-[highlighted]:bg-card-background-active"
+                                class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none data-[highlighted]:bg-accent data-[highlighted]:text-accent-foreground"
                                 :data-client-id="client.id">
-                                <ClientDropdownItem
-                                    :selected="isClientSelected(client.id)"
-                                    :name="client.name" />
+                                <span>{{ client.name }}</span>
+                                <span
+                                    v-if="isClientSelected(client.id)"
+                                    class="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+                                    <Check class="h-4 w-4" />
+                                </span>
                             </ComboboxItem>
                             <div
                                 v-if="searchValue.length > 0 && filteredClients.length === 0"
-                                class="bg-card-background-active">
-                                <div
-                                    class="flex space-x-3 items-center px-4 py-3 text-xs text-text-primary font-medium border-t rounded-b-lg border-card-background-separator"
-                                    @click="addClientIfNoneExists">
-                                    <PlusCircleIcon class="w-5 flex-shrink-0" />
-                                    <span>Add "{{ searchValue }}" as a new Client</span>
-                                </div>
+                                class="flex items-center gap-2 rounded-sm px-2 py-1.5 text-sm cursor-pointer hover:bg-accent hover:text-accent-foreground"
+                                @click="addClientIfNoneExists">
+                                <Plus class="h-4 w-4 shrink-0" />
+                                <span>Add "{{ searchValue }}" as a new Client</span>
                             </div>
                         </ComboboxViewport>
                     </ComboboxContent>
diff --git a/resources/js/packages/ui/src/EstimatedTimeSection.vue b/resources/js/packages/ui/src/EstimatedTimeSection.vue
index 8425c8e7..39975290 100644
--- a/resources/js/packages/ui/src/EstimatedTimeSection.vue
+++ b/resources/js/packages/ui/src/EstimatedTimeSection.vue
@@ -1,26 +1,23 @@
 <script setup lang="ts">
 import EstimatedTimeInput from '@/packages/ui/src/Input/EstimatedTimeInput.vue';
 import { ClockIcon } from '@heroicons/vue/20/solid';
-import { Field, FieldLabel } from './field';
+import { Field, FieldDescription, FieldLabel } from './field';
 
 const model = defineModel<number | null>();
 const emit = defineEmits(['submit']);
 </script>
 
 <template>
-    <Field class="pt-6">
-        <div class="flex items-center space-x-1">
-            <ClockIcon class="text-text-quaternary w-4"></ClockIcon>
-            <FieldLabel for="billable">Time Estimated</FieldLabel>
-        </div>
-        <EstimatedTimeInput v-model="model" @submit="emit('submit')"></EstimatedTimeInput>
-        <div class="flex items-center text-text-secondary text-xs pt-2 pl-1">
-            <span>
-                <span class="font-semibold">Info:</span>
-                You can type natural language like
-                <span class="font-semibold">2h 30m</span>
-            </span>
-        </div>
+    <Field>
+        <FieldLabel for="time_estimated" :icon="ClockIcon">Time Estimated</FieldLabel>
+        <EstimatedTimeInput
+            id="time_estimated"
+            v-model="model"
+            @submit="emit('submit')"></EstimatedTimeInput>
+        <FieldDescription>
+            You can type natural language like
+            <span class="font-semibold">2h 30m</span>
+        </FieldDescription>
     </Field>
 </template>
 
diff --git a/resources/js/packages/ui/src/Input/BillableRateInput.vue b/resources/js/packages/ui/src/Input/BillableRateInput.vue
index 3e60fc3c..bb07f587 100644
--- a/resources/js/packages/ui/src/Input/BillableRateInput.vue
+++ b/resources/js/packages/ui/src/Input/BillableRateInput.vue
@@ -13,6 +13,7 @@ const props = defineProps<{
     name: string;
     focus?: boolean;
     currency: string;
+    disabled?: boolean;
 }>();
 
 const model = defineModel<number | null>({
@@ -33,6 +34,7 @@ function formatValue(modelValue: number | null) {
             :id="name"
             ref="billableRateInput"
             :model-value="formatValue(model)"
+            :disabled="disabled"
             :step-snapping="false"
             class="block w-full"
             :format-options="{
diff --git a/resources/js/packages/ui/src/Project/ProjectColorSelector.vue b/resources/js/packages/ui/src/Project/ProjectColorSelector.vue
index bfa18b42..c82b5f64 100644
--- a/resources/js/packages/ui/src/Project/ProjectColorSelector.vue
+++ b/resources/js/packages/ui/src/Project/ProjectColorSelector.vue
@@ -10,12 +10,12 @@ const model = defineModel<string>({ default: '' });
         <Dropdown align="center">
             <template #trigger>
                 <button
-                    class="p-2 bg-input-background hover:bg-tertiary transition rounded-full border border-input-border">
+                    class="h-9 w-9 flex items-center justify-center bg-input-background hover:bg-tertiary transition rounded-full border border-input-border">
                     <div
                         :style="{
                             backgroundColor: model,
                         }"
-                        class="w-6 h-6 rounded-full cursor-pointer"></div>
+                        class="w-5 h-5 rounded-full cursor-pointer"></div>
                 </button>
             </template>
             <template #content>
diff --git a/resources/js/packages/ui/src/Project/ProjectCreateModal.vue b/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
index 9c8fb7b2..da3338a6 100644
--- a/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
+++ b/resources/js/packages/ui/src/Project/ProjectCreateModal.vue
@@ -8,11 +8,12 @@ import { getRandomColor } from '@/packages/ui/src/utils/color';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import { useFocus } from '@vueuse/core';
 import ClientDropdown from '@/packages/ui/src/Client/ClientDropdown.vue';
-import Badge from '@/packages/ui/src/Badge.vue';
 import ProjectColorSelector from '@/packages/ui/src/Project/ProjectColorSelector.vue';
+import { Button } from '@/packages/ui/src/Buttons';
+import { ChevronDown } from 'lucide-vue-next';
 import { UserCircleIcon } from '@heroicons/vue/20/solid';
 import EstimatedTimeSection from '@/packages/ui/src/EstimatedTimeSection.vue';
-import { Field, FieldLabel } from '../field';
+import { Field, FieldGroup, FieldLabel } from '../field';
 import ProjectEditBillableSection from '@/packages/ui/src/Project/ProjectEditBillableSection.vue';
 import type { Client } from '@/packages/api/src';
 
@@ -74,9 +75,9 @@ const currentClientName = computed(() => {
         </template>
 
         <template #content>
-            <div class="sm:flex items-center space-y-2 sm:space-y-0 sm:space-x-4">
-                <div class="flex-1 flex items-center">
-                    <Field class="text-center pr-5">
+            <FieldGroup>
+                <FieldGroup class="flex-row items-end">
+                    <Field class="w-auto text-center">
                         <FieldLabel for="color">Color</FieldLabel>
                         <ProjectColorSelector v-model="project.color"></ProjectColorSelector>
                     </Field>
@@ -94,43 +95,30 @@ const currentClientName = computed(() => {
                             autocomplete="projectName"
                             @keydown.enter="submit()" />
                     </Field>
-                </div>
+                </FieldGroup>
                 <Field>
-                    <FieldLabel for="client">Client</FieldLabel>
+                    <FieldLabel for="client" :icon="UserCircleIcon">Client</FieldLabel>
                     <ClientDropdown
                         v-model="project.client_id"
                         :create-client="createClient"
                         :clients="activeClients">
                         <template #trigger>
-                            <Badge
-                                tag="button"
-                                class="bg-input-background cursor-pointer hover:bg-tertiary"
-                                size="xlarge">
-                                <div class="flex items-center space-x-2">
-                                    <UserCircleIcon class="w-5 text-icon-default"></UserCircleIcon>
-                                    <span>
-                                        {{ currentClientName }}
-                                    </span>
-                                </div>
-                            </Badge>
+                            <Button variant="input" class="w-full justify-between">
+                                <span class="truncate">{{ currentClientName }}</span>
+                                <ChevronDown class="w-4 h-4 text-icon-default" />
+                            </Button>
                         </template>
                     </ClientDropdown>
                 </Field>
-            </div>
-            <div>
-                <div>
-                    <ProjectEditBillableSection
-                        v-model:is-billable="project.is_billable"
-                        v-model:billable-rate="project.billable_rate"
-                        :currency="currency"></ProjectEditBillableSection>
-                </div>
-                <div>
-                    <EstimatedTimeSection
-                        v-if="enableEstimatedTime"
-                        v-model="project.estimated_time"
-                        @submit="submit()"></EstimatedTimeSection>
-                </div>
-            </div>
+                <ProjectEditBillableSection
+                    v-model:is-billable="project.is_billable"
+                    v-model:billable-rate="project.billable_rate"
+                    :currency="currency"></ProjectEditBillableSection>
+                <EstimatedTimeSection
+                    v-if="enableEstimatedTime"
+                    v-model="project.estimated_time"
+                    @submit="submit()"></EstimatedTimeSection>
+            </FieldGroup>
         </template>
         <template #footer>
             <SecondaryButton @click="show = false"> Cancel</SecondaryButton>
diff --git a/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue b/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
index 02d35adb..c49e58d9 100644
--- a/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
+++ b/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
@@ -1,82 +1,137 @@
 <script setup lang="ts">
-import { Field, FieldLabel } from '../field';
+import { Field, FieldDescription, FieldLabel } from '../field';
 import BillableRateInput from '@/packages/ui/src/Input/BillableRateInput.vue';
-import ProjectBillableSelect from '@/packages/ui/src/Project/ProjectBillableSelect.vue';
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from '@/Components/ui/select';
+import {
+    Tooltip,
+    TooltipContent,
+    TooltipProvider,
+    TooltipTrigger,
+} from '@/packages/ui/src/tooltip';
 import { computed, onMounted, ref, watch } from 'vue';
-import type { BillableKey } from '@/types/projects';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
+import { useOrganizationQuery } from '@/utils/useOrganizationQuery';
+import { getCurrentOrganizationId } from '@/utils/useUser';
 
 defineProps<{
     currency: string;
 }>();
 
-const billableRateSelect = ref<BillableKey>('non-billable');
+const { organization } = useOrganizationQuery(getCurrentOrganizationId()!);
+
+type RateType = 'default-rate' | 'custom-rate';
+
+const billableDefault = ref<'billable' | 'non-billable'>('non-billable');
+const rateType = ref<RateType>('default-rate');
 
 const billableRate = defineModel<number | null>('billableRate');
 const isBillable = defineModel<boolean>('isBillable');
 
 onMounted(() => {
     if (isBillable.value === true) {
-        if (billableRate.value) {
-            billableRateSelect.value = 'custom-rate';
-        } else {
-            billableRateSelect.value = 'default-rate';
-        }
+        billableDefault.value = 'billable';
+        rateType.value = billableRate.value ? 'custom-rate' : 'default-rate';
     }
 });
 
-watch(billableRateSelect, () => {
-    if (billableRateSelect.value === 'non-billable') {
+watch(billableDefault, () => {
+    if (billableDefault.value === 'non-billable') {
         isBillable.value = false;
-        billableRate.value = null;
-    } else if (billableRateSelect.value === 'default-rate') {
-        isBillable.value = true;
-        billableRate.value = null;
     } else {
         isBillable.value = true;
     }
 });
 
-billableRateSelect.value = 'non-billable';
-
-const billableOptionInfoTexts: { [key in BillableKey]: string } = {
-    'non-billable': 'New time entries for this project will not be marked billable by default.',
-    'default-rate':
-        'New time entries for this project will be billable at the default rate by default.',
-    'custom-rate':
-        'New time entries for this project will be billable at a custom rate by default.',
-};
-
-const billableOptionInfoText = computed(() => {
-    return billableOptionInfoTexts[billableRateSelect.value];
+watch(rateType, () => {
+    if (rateType.value === 'default-rate') {
+        billableRate.value = null;
+    } else if (rateType.value === 'custom-rate') {
+        billableDefault.value = 'billable';
+        isBillable.value = true;
+        if (!billableRate.value) {
+            billableRate.value = organization.value?.billable_rate ?? null;
+        }
+    }
 });
+
+const displayedRate = computed({
+    get() {
+        if (rateType.value === 'default-rate') {
+            return organization.value?.billable_rate ?? null;
+        }
+        return billableRate.value;
+    },
+    set(value: number | null) {
+        if (rateType.value === 'custom-rate') {
+            billableRate.value = value;
+        }
+    },
+});
+
+const billableDescription = computed(() => {
+    if (billableDefault.value === 'non-billable') {
+        return 'New time entries for this project will not be marked billable by default.';
+    }
+    return 'New time entries for this project will be marked billable by default.';
+});
+
 const emit = defineEmits(['submit']);
 </script>
 
 <template>
-    <div class="sm:flex items-center space-y-2 sm:space-y-0 sm:space-x-4 pt-6">
-        <Field>
-            <div class="flex items-center space-x-1">
-                <BillableIcon class="text-text-quaternary h-4 ml-1 mr-0.5"></BillableIcon>
-                <FieldLabel for="billable">Billable Default</FieldLabel>
-            </div>
-            <ProjectBillableSelect v-model="billableRateSelect"></ProjectBillableSelect>
-        </Field>
-        <Field v-if="billableRateSelect === 'custom-rate'">
-            <FieldLabel for="billableRate">Billable Rate</FieldLabel>
+    <Field>
+        <FieldLabel for="billable" :icon="BillableIcon">Billable Default</FieldLabel>
+        <Select v-model="billableDefault">
+            <SelectTrigger id="billable">
+                <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+                <SelectItem value="non-billable">Non-billable</SelectItem>
+                <SelectItem value="billable">Billable</SelectItem>
+            </SelectContent>
+        </Select>
+        <FieldDescription>{{ billableDescription }}</FieldDescription>
+    </Field>
+    <Field>
+        <FieldLabel :icon="BillableIcon" for="billableRateType">Billable Rate</FieldLabel>
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+            <Select v-model="rateType">
+                <SelectTrigger id="billableRateType">
+                    <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                    <SelectItem value="default-rate">Default Rate</SelectItem>
+                    <SelectItem value="custom-rate">Custom Rate</SelectItem>
+                </SelectContent>
+            </Select>
+            <TooltipProvider v-if="rateType === 'default-rate'">
+                <Tooltip>
+                    <TooltipTrigger as-child>
+                        <div>
+                            <BillableRateInput
+                                v-model="displayedRate"
+                                :currency="currency"
+                                disabled
+                                name="billableRate" />
+                        </div>
+                    </TooltipTrigger>
+                    <TooltipContent> Uses the default rate of the organization </TooltipContent>
+                </Tooltip>
+            </TooltipProvider>
             <BillableRateInput
-                v-model="billableRate"
+                v-else
+                v-model="displayedRate"
                 :currency="currency"
                 name="billableRate"
                 @keydown.enter="emit('submit')" />
-        </Field>
-    </div>
-    <div class="flex items-center text-text-secondary text-xs pt-2 pl-1">
-        <span>
-            <span class="font-semibold"> Info: </span>
-            {{ billableOptionInfoText }}
-        </span>
-    </div>
+        </div>
+    </Field>
 </template>
 
 <style scoped></style>
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
index 81dca82f..5c71f0c5 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
@@ -166,7 +166,7 @@ const billableProxy = computed({
                             @keydown.enter="submit" />
                     </div>
                 </div>
-                <div class="flex flex-col sm:flex-row sm:items-end gap-2 sm:gap-4 pt-4">
+                <div class="flex flex-col sm:flex-row sm:items-end gap-2 sm:gap-4">
                     <div class="flex-1 min-w-0">
                         <TimeTrackerProjectTaskDropdown
                             v-model:project="editableTimeEntry.project_id"
diff --git a/resources/js/packages/ui/src/field/FieldLabel.vue b/resources/js/packages/ui/src/field/FieldLabel.vue
index 391c4793..f7001817 100644
--- a/resources/js/packages/ui/src/field/FieldLabel.vue
+++ b/resources/js/packages/ui/src/field/FieldLabel.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import type { HTMLAttributes } from 'vue';
+import type { Component, HTMLAttributes } from 'vue';
 import { cn } from '@/lib/utils';
 import { Label } from '@/Components/ui/label';
 
 const props = defineProps<{
     class?: HTMLAttributes['class'];
+    icon?: Component;
 }>();
 </script>
 
@@ -13,12 +14,14 @@ const props = defineProps<{
         data-slot="field-label"
         :class="
             cn(
-                'group/field-label peer/field-label flex w-fit gap-2 leading-snug group-data-[disabled=true]/field:opacity-50',
+                'group/field-label peer/field-label flex w-fit gap-1.5 leading-snug group-data-[disabled=true]/field:opacity-50',
                 'has-[>[data-slot=field]]:w-full has-[>[data-slot=field]]:flex-col has-[>[data-slot=field]]:rounded-md has-[>[data-slot=field]]:border [&_>[data-slot=field]]:p-3',
                 'has-[[data-state=checked]]:bg-primary/5 has-[[data-state=checked]]:border-primary dark:has-[[data-state=checked]]:bg-primary/10',
+                icon ? 'items-center' : '',
                 props.class
             )
         ">
+        <component :is="icon" v-if="icon" class="h-4 w-4 text-text-quaternary shrink-0" />
         <slot />
     </Label>
 </template>