diff --git a/front/src/modules/companies/components/CompanyAccountOwnerCell.tsx b/front/src/modules/companies/components/CompanyAccountOwnerCell.tsx
index 0ddff6959..6c37a62bc 100644
--- a/front/src/modules/companies/components/CompanyAccountOwnerCell.tsx
+++ b/front/src/modules/companies/components/CompanyAccountOwnerCell.tsx
@@ -1,6 +1,7 @@
 import { PersonChip } from '@/people/components/PersonChip';
 import { RelationPickerHotkeyScope } from '@/relation-picker/types/RelationPickerHotkeyScope';
 import { EditableCell } from '@/ui/components/editable-cell/EditableCell';
+import { useEditableCell } from '@/ui/components/editable-cell/hooks/useEditableCell';
 import { Company, User } from '~/generated/graphql';
 
 import { CompanyAccountOwnerPicker } from './CompanyAccountOwnerPicker';
@@ -14,10 +15,26 @@ export type OwnProps = {
 };
 
 export function CompanyAccountOwnerCell({ company }: OwnProps) {
+  const { closeEditableCell } = useEditableCell();
+
+  function handleCancel() {
+    closeEditableCell();
+  }
+
+  function handleSubmit() {
+    closeEditableCell();
+  }
+
   return (
     <EditableCell
       editHotkeyScope={{ scope: RelationPickerHotkeyScope.RelationPicker }}
-      editModeContent={<CompanyAccountOwnerPicker company={company} />}
+      editModeContent={
+        <CompanyAccountOwnerPicker
+          onCancel={handleCancel}
+          onSubmit={handleSubmit}
+          company={company}
+        />
+      }
       nonEditModeContent={
         company.accountOwner?.displayName ? (
           <PersonChip
diff --git a/front/src/modules/companies/components/CompanyAccountOwnerPicker.tsx b/front/src/modules/companies/components/CompanyAccountOwnerPicker.tsx
index 2e53b50f7..071503689 100644
--- a/front/src/modules/companies/components/CompanyAccountOwnerPicker.tsx
+++ b/front/src/modules/companies/components/CompanyAccountOwnerPicker.tsx
@@ -4,7 +4,6 @@ import { relationPickerSearchFilterScopedState } from '@/relation-picker/states/
 import { EntityForSelect } from '@/relation-picker/types/EntityForSelect';
 import { Entity } from '@/relation-picker/types/EntityTypeForSelect';
 import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
-import { useEditableCell } from '@/ui/components/editable-cell/hooks/useEditableCell';
 import {
   Company,
   User,
@@ -16,20 +15,24 @@ export type OwnProps = {
   company: Pick<Company, 'id'> & {
     accountOwner?: Pick<User, 'id' | 'displayName'> | null;
   };
+  onSubmit?: () => void;
+  onCancel?: () => void;
 };
 
 type UserForSelect = EntityForSelect & {
   entityType: Entity.User;
 };
 
-export function CompanyAccountOwnerPicker({ company }: OwnProps) {
+export function CompanyAccountOwnerPicker({
+  company,
+  onSubmit,
+  onCancel,
+}: OwnProps) {
   const [searchFilter] = useRecoilScopedState(
     relationPickerSearchFilterScopedState,
   );
   const [updateCompany] = useUpdateCompanyMutation();
 
-  const { closeEditableCell } = useEditableCell();
-
   const companies = useFilteredSearchEntityQuery({
     queryHook: useSearchUserQuery,
     selectedIds: [company?.accountOwner?.id ?? ''],
@@ -52,12 +55,13 @@ export function CompanyAccountOwnerPicker({ company }: OwnProps) {
       },
     });
 
-    closeEditableCell();
+    onSubmit?.();
   }
 
   return (
     <SingleEntitySelect
       onEntitySelected={handleEntitySelected}
+      onCancel={onCancel}
       entities={{
         loading: companies.loading,
         entitiesToSelect: companies.entitiesToSelect,
diff --git a/front/src/modules/companies/fields/components/CompanyAccountOwnerEditableField.tsx b/front/src/modules/companies/fields/components/CompanyAccountOwnerEditableField.tsx
new file mode 100644
index 000000000..79f76f8cc
--- /dev/null
+++ b/front/src/modules/companies/fields/components/CompanyAccountOwnerEditableField.tsx
@@ -0,0 +1,53 @@
+import { IconUserCircle } from '@tabler/icons-react';
+
+import { PersonChip } from '@/people/components/PersonChip';
+import { RecoilScope } from '@/recoil-scope/components/RecoilScope';
+import { RelationPickerHotkeyScope } from '@/relation-picker/types/RelationPickerHotkeyScope';
+import { EditableField } from '@/ui/editable-fields/components/EditableField';
+import { FieldContext } from '@/ui/editable-fields/states/FieldContext';
+import { Company, User } from '~/generated/graphql';
+import { PageHotkeyScope } from '~/sync-hooks/types/PageHotkeyScope';
+
+import { CompanyAccountOwnerPickerFieldEditMode } from './CompanyAccountOwnerPickerFieldEditMode';
+
+type OwnProps = {
+  company: Pick<Company, 'id' | 'accountOwnerId'> & {
+    accountOwner?: Pick<User, 'id' | 'displayName'> | null;
+  };
+};
+
+export function CompanyAccountOwnerEditableField({ company }: OwnProps) {
+  return (
+    <RecoilScope SpecificContext={FieldContext}>
+      <RecoilScope>
+        <EditableField
+          customEditHotkeyScope={{
+            scope: RelationPickerHotkeyScope.RelationPicker,
+          }}
+          parentHotkeyScope={{
+            scope: PageHotkeyScope.CompanyShowPage,
+          }}
+          iconLabel={<IconUserCircle />}
+          editModeContent={
+            <CompanyAccountOwnerPickerFieldEditMode
+              parentHotkeyScope={{
+                scope: PageHotkeyScope.CompanyShowPage,
+              }}
+              company={company}
+            />
+          }
+          displayModeContent={
+            company.accountOwner?.displayName ? (
+              <PersonChip
+                id={company.accountOwner.id}
+                name={company.accountOwner?.displayName ?? ''}
+              />
+            ) : (
+              <></>
+            )
+          }
+        />
+      </RecoilScope>
+    </RecoilScope>
+  );
+}
diff --git a/front/src/modules/companies/fields/components/CompanyAccountOwnerPickerFieldEditMode.tsx b/front/src/modules/companies/fields/components/CompanyAccountOwnerPickerFieldEditMode.tsx
new file mode 100644
index 000000000..c827cac26
--- /dev/null
+++ b/front/src/modules/companies/fields/components/CompanyAccountOwnerPickerFieldEditMode.tsx
@@ -0,0 +1,50 @@
+import styled from '@emotion/styled';
+
+import { CompanyAccountOwnerPicker } from '@/companies/components/CompanyAccountOwnerPicker';
+import { HotkeyScope } from '@/lib/hotkeys/types/HotkeyScope';
+import { useEditableField } from '@/ui/editable-fields/hooks/useEditableField';
+import { Company, User } from '~/generated/graphql';
+
+const CompanyAccountOwnerPickerContainer = styled.div`
+  left: 24px;
+  position: absolute;
+  top: -8px;
+`;
+
+export type OwnProps = {
+  company: Pick<Company, 'id'> & {
+    accountOwner?: Pick<User, 'id' | 'displayName'> | null;
+  };
+  onSubmit?: () => void;
+  onCancel?: () => void;
+  parentHotkeyScope?: HotkeyScope;
+};
+
+export function CompanyAccountOwnerPickerFieldEditMode({
+  company,
+  onSubmit,
+  onCancel,
+  parentHotkeyScope,
+}: OwnProps) {
+  const { closeEditableField } = useEditableField(parentHotkeyScope);
+
+  function handleSubmit() {
+    closeEditableField();
+    onSubmit?.();
+  }
+
+  function handleCancel() {
+    closeEditableField();
+    onCancel?.();
+  }
+
+  return (
+    <CompanyAccountOwnerPickerContainer>
+      <CompanyAccountOwnerPicker
+        company={company}
+        onCancel={handleCancel}
+        onSubmit={handleSubmit}
+      />
+    </CompanyAccountOwnerPickerContainer>
+  );
+}
diff --git a/front/src/modules/companies/fields/components/CompanyAddressEditableField.tsx b/front/src/modules/companies/fields/components/CompanyAddressEditableField.tsx
new file mode 100644
index 000000000..cea05e082
--- /dev/null
+++ b/front/src/modules/companies/fields/components/CompanyAddressEditableField.tsx
@@ -0,0 +1,60 @@
+import { useEffect, useState } from 'react';
+import { IconMap } from '@tabler/icons-react';
+
+import { RecoilScope } from '@/recoil-scope/components/RecoilScope';
+import { EditableField } from '@/ui/editable-fields/components/EditableField';
+import { FieldContext } from '@/ui/editable-fields/states/FieldContext';
+import { InplaceInputText } from '@/ui/inplace-inputs/components/InplaceInputText';
+import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
+
+type OwnProps = {
+  company: Pick<Company, 'id' | 'address'>;
+};
+
+export function CompanyAddressEditableField({ company }: OwnProps) {
+  const [internalValue, setInternalValue] = useState(company.address);
+
+  const [updateCompany] = useUpdateCompanyMutation();
+
+  useEffect(() => {
+    setInternalValue(company.address);
+  }, [company.address]);
+
+  async function handleChange(newValue: string) {
+    setInternalValue(newValue);
+  }
+
+  async function handleSubmit() {
+    await updateCompany({
+      variables: {
+        id: company.id,
+        address: internalValue ?? '',
+      },
+    });
+  }
+
+  async function handleCancel() {
+    setInternalValue(company.address);
+  }
+
+  return (
+    <RecoilScope SpecificContext={FieldContext}>
+      <EditableField
+        onSubmit={handleSubmit}
+        onCancel={handleCancel}
+        iconLabel={<IconMap />}
+        editModeContent={
+          <InplaceInputText
+            placeholder={'Address'}
+            autoFocus
+            value={internalValue}
+            onChange={(newValue: string) => {
+              handleChange(newValue);
+            }}
+          />
+        }
+        displayModeContent={internalValue ?? ''}
+      />
+    </RecoilScope>
+  );
+}
diff --git a/front/src/modules/companies/fields/components/CompanyCreatedAtEditableField.tsx b/front/src/modules/companies/fields/components/CompanyCreatedAtEditableField.tsx
new file mode 100644
index 000000000..c2e2c05e8
--- /dev/null
+++ b/front/src/modules/companies/fields/components/CompanyCreatedAtEditableField.tsx
@@ -0,0 +1,62 @@
+import { useEffect, useState } from 'react';
+import { IconCalendar } from '@tabler/icons-react';
+
+import { RecoilScope } from '@/recoil-scope/components/RecoilScope';
+import { EditableField } from '@/ui/editable-fields/components/EditableField';
+import { FieldContext } from '@/ui/editable-fields/states/FieldContext';
+import { EditableFieldEditModeDate } from '@/ui/editable-fields/variants/components/EditableFieldEditModeDate';
+import { parseDate } from '@/utils/datetime/date-utils';
+import { formatToHumanReadableDate } from '@/utils/utils';
+import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
+
+type OwnProps = {
+  company: Pick<Company, 'id' | 'createdAt'>;
+};
+
+export function CompanyCreatedAtEditableField({ company }: OwnProps) {
+  const [internalValue, setInternalValue] = useState(company.createdAt);
+
+  const [updateCompany] = useUpdateCompanyMutation();
+
+  useEffect(() => {
+    setInternalValue(company.createdAt);
+  }, [company.createdAt]);
+
+  async function handleChange(newValue: string) {
+    setInternalValue(newValue);
+  }
+
+  async function handleSubmit() {
+    await updateCompany({
+      variables: {
+        id: company.id,
+        createdAt: internalValue ?? '',
+      },
+    });
+  }
+
+  async function handleCancel() {
+    setInternalValue(company.createdAt);
+  }
+
+  return (
+    <RecoilScope SpecificContext={FieldContext}>
+      <EditableField
+        onSubmit={handleSubmit}
+        onCancel={handleCancel}
+        iconLabel={<IconCalendar />}
+        editModeContent={
+          <EditableFieldEditModeDate
+            value={internalValue}
+            onChange={handleChange}
+          />
+        }
+        displayModeContent={
+          internalValue !== ''
+            ? formatToHumanReadableDate(parseDate(internalValue).toJSDate())
+            : 'No date'
+        }
+      />
+    </RecoilScope>
+  );
+}
diff --git a/front/src/modules/companies/fields/components/CompanyDomainNameEditableField.tsx b/front/src/modules/companies/fields/components/CompanyDomainNameEditableField.tsx
new file mode 100644
index 000000000..ee3d4f1b4
--- /dev/null
+++ b/front/src/modules/companies/fields/components/CompanyDomainNameEditableField.tsx
@@ -0,0 +1,62 @@
+import { useEffect, useState } from 'react';
+import { IconLink } from '@tabler/icons-react';
+
+import { RecoilScope } from '@/recoil-scope/components/RecoilScope';
+import { EditableField } from '@/ui/editable-fields/components/EditableField';
+import { FieldDisplayURL } from '@/ui/editable-fields/components/FieldDisplayURL';
+import { FieldContext } from '@/ui/editable-fields/states/FieldContext';
+import { InplaceInputText } from '@/ui/inplace-inputs/components/InplaceInputText';
+import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
+
+type OwnProps = {
+  company: Pick<Company, 'id' | 'domainName'>;
+};
+
+export function CompanyDomainNameEditableField({ company }: OwnProps) {
+  const [internalValue, setInternalValue] = useState(company.domainName);
+
+  const [updateCompany] = useUpdateCompanyMutation();
+
+  useEffect(() => {
+    setInternalValue(company.domainName);
+  }, [company.domainName]);
+
+  async function handleChange(newValue: string) {
+    setInternalValue(newValue);
+  }
+
+  async function handleSubmit() {
+    await updateCompany({
+      variables: {
+        id: company.id,
+        domainName: internalValue ?? '',
+      },
+    });
+  }
+
+  async function handleCancel() {
+    setInternalValue(company.domainName);
+  }
+
+  return (
+    <RecoilScope SpecificContext={FieldContext}>
+      <EditableField
+        iconLabel={<IconLink />}
+        onCancel={handleCancel}
+        onSubmit={handleSubmit}
+        editModeContent={
+          <InplaceInputText
+            placeholder={'URL'}
+            autoFocus
+            value={internalValue}
+            onChange={(newValue: string) => {
+              handleChange(newValue);
+            }}
+          />
+        }
+        displayModeContent={<FieldDisplayURL URL={internalValue} />}
+        useEditButton
+      />
+    </RecoilScope>
+  );
+}
diff --git a/front/src/modules/companies/fields/components/CompanyEmployeesEditableField.tsx b/front/src/modules/companies/fields/components/CompanyEmployeesEditableField.tsx
new file mode 100644
index 000000000..235f11b56
--- /dev/null
+++ b/front/src/modules/companies/fields/components/CompanyEmployeesEditableField.tsx
@@ -0,0 +1,76 @@
+import { useEffect, useState } from 'react';
+import { IconUsers } from '@tabler/icons-react';
+
+import { RecoilScope } from '@/recoil-scope/components/RecoilScope';
+import { EditableField } from '@/ui/editable-fields/components/EditableField';
+import { FieldContext } from '@/ui/editable-fields/states/FieldContext';
+import { InplaceInputText } from '@/ui/inplace-inputs/components/InplaceInputText';
+import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
+
+type OwnProps = {
+  company: Pick<Company, 'id' | 'employees'>;
+};
+
+export function CompanyEmployeesEditableField({ company }: OwnProps) {
+  const [internalValue, setInternalValue] = useState(
+    company.employees?.toString(),
+  );
+
+  const [updateCompany] = useUpdateCompanyMutation();
+
+  useEffect(() => {
+    setInternalValue(company.employees?.toString());
+  }, [company.employees]);
+
+  async function handleChange(newValue: string) {
+    setInternalValue(newValue);
+  }
+
+  async function handleSubmit() {
+    if (!internalValue) return;
+
+    try {
+      const numberValue = parseInt(internalValue);
+
+      if (isNaN(numberValue)) {
+        throw new Error('Not a number');
+      }
+
+      await updateCompany({
+        variables: {
+          id: company.id,
+          employees: numberValue,
+        },
+      });
+
+      setInternalValue(numberValue.toString());
+    } catch {
+      handleCancel();
+    }
+  }
+
+  async function handleCancel() {
+    setInternalValue(company.employees?.toString());
+  }
+
+  return (
+    <RecoilScope SpecificContext={FieldContext}>
+      <EditableField
+        onSubmit={handleSubmit}
+        onCancel={handleCancel}
+        iconLabel={<IconUsers />}
+        editModeContent={
+          <InplaceInputText
+            placeholder={'Employees'}
+            autoFocus
+            value={internalValue ?? ''}
+            onChange={(newValue: string) => {
+              handleChange(newValue);
+            }}
+          />
+        }
+        displayModeContent={internalValue}
+      />
+    </RecoilScope>
+  );
+}
diff --git a/front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts b/front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
index 9f62ec8b6..e466dd524 100644
--- a/front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
+++ b/front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
@@ -10,7 +10,7 @@ import {
   SortOrder,
 } from '~/generated/graphql';
 
-type SelectStringKeys<T> = NonNullable<
+export type SelectStringKeys<T> = NonNullable<
   {
     [K in keyof T]: K extends '__typename'
       ? never
@@ -20,7 +20,7 @@ type SelectStringKeys<T> = NonNullable<
   }[keyof T]
 >;
 
-type ExtractEntityTypeFromQueryResponse<T> = T extends {
+export type ExtractEntityTypeFromQueryResponse<T> = T extends {
   searchResults: Array<infer U>;
 }
   ? U
diff --git a/front/src/modules/ui/board-card-field-inputs/components/BoardCardEditableFieldDateEditMode.tsx b/front/src/modules/ui/board-card-field-inputs/components/BoardCardEditableFieldDateEditMode.tsx
index 3e6f719ad..0c59fbe38 100644
--- a/front/src/modules/ui/board-card-field-inputs/components/BoardCardEditableFieldDateEditMode.tsx
+++ b/front/src/modules/ui/board-card-field-inputs/components/BoardCardEditableFieldDateEditMode.tsx
@@ -1,4 +1,4 @@
-import { InplaceInputDateEditMode } from '@/ui/inplace-inputs/components/InplaceInputDateEditMode';
+import { InplaceInputDate } from '@/ui/inplace-inputs/components/InplaceInputDate';
 
 type OwnProps = {
   value: Date;
@@ -13,5 +13,5 @@ export function BoardCardEditableFieldDateEditMode({
     onChange(newDate);
   }
 
-  return <InplaceInputDateEditMode value={value} onChange={handleDateChange} />;
+  return <InplaceInputDate value={value} onChange={handleDateChange} />;
 }
diff --git a/front/src/modules/ui/components/buttons/IconButton.tsx b/front/src/modules/ui/components/buttons/IconButton.tsx
index 334187c28..51e2e3d89 100644
--- a/front/src/modules/ui/components/buttons/IconButton.tsx
+++ b/front/src/modules/ui/components/buttons/IconButton.tsx
@@ -13,11 +13,11 @@ export type ButtonProps = {
 
 const StyledIconButton = styled.button<Pick<ButtonProps, 'variant' | 'size'>>`
   align-items: center;
-  background: ${({ theme, variant, disabled }) => {
+  background: ${({ theme, variant }) => {
     switch (variant) {
       case 'shadow':
       case 'white':
-        return theme.background.transparent.lighter;
+        return theme.background.transparent.primary;
       case 'transparent':
       case 'border':
       default:
@@ -35,10 +35,10 @@ const StyledIconButton = styled.button<Pick<ButtonProps, 'variant' | 'size'>>`
         return 'none';
     }
   }};
-  transition: background 0.1s ease;
   border-radius: ${({ theme }) => {
     return theme.border.radius.sm;
   }};
+  border-style: solid;
   border-width: ${({ variant }) => {
     switch (variant) {
       case 'border':
@@ -50,6 +50,17 @@ const StyledIconButton = styled.button<Pick<ButtonProps, 'variant' | 'size'>>`
         return 0;
     }
   }};
+  box-shadow: ${({ theme, variant }) => {
+    switch (variant) {
+      case 'shadow':
+        return theme.boxShadow.light;
+      case 'border':
+      case 'white':
+      case 'transparent':
+      default:
+        return 'none';
+    }
+  }};
   color: ${({ theme, disabled }) => {
     if (disabled) {
       return theme.font.color.extraLight;
@@ -57,8 +68,9 @@ const StyledIconButton = styled.button<Pick<ButtonProps, 'variant' | 'size'>>`
 
     return theme.font.color.tertiary;
   }};
-  border-style: solid;
   cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
+  display: flex;
+  flex-shrink: 0;
   height: ${({ size }) => {
     switch (size) {
       case 'large':
@@ -70,9 +82,15 @@ const StyledIconButton = styled.button<Pick<ButtonProps, 'variant' | 'size'>>`
         return '20px';
     }
   }};
-  display: flex;
   justify-content: center;
   padding: 0;
+  transition: background 0.1s ease;
+  user-select: none;
+  &:hover {
+    background: ${({ theme, disabled }) => {
+      return disabled ? 'auto' : theme.background.transparent.light;
+    }};
+  }
   width: ${({ size }) => {
     switch (size) {
       case 'large':
@@ -84,17 +102,11 @@ const StyledIconButton = styled.button<Pick<ButtonProps, 'variant' | 'size'>>`
         return '20px';
     }
   }};
-  flex-shrink: 0;
-  &:hover {
-    background: ${({ theme, disabled }) => {
-      return disabled ? 'auto' : theme.background.transparent.light;
-    }};
-  }
-  user-select: none;
   &:active {
     background: ${({ theme, disabled }) => {
       return disabled ? 'auto' : theme.background.transparent.medium;
     }};
+  }
 `;
 
 export function IconButton({
diff --git a/front/src/modules/ui/components/editable-cell/EditableCellEditMode.tsx b/front/src/modules/ui/components/editable-cell/EditableCellEditMode.tsx
index 3f0ad7d62..936556cb2 100644
--- a/front/src/modules/ui/components/editable-cell/EditableCellEditMode.tsx
+++ b/front/src/modules/ui/components/editable-cell/EditableCellEditMode.tsx
@@ -12,14 +12,16 @@ export const EditableCellEditModeContainer = styled.div<OwnProps>`
   display: flex;
   left: ${(props) =>
     props.editModeHorizontalAlign === 'right' ? 'auto' : '0'};
-  margin-left: -2px;
-  min-height: 100%;
-  min-width: calc(100% + 20px);
-  position: absolute;
+  margin-left: -1px;
+  margin-top: -1px;
 
+  min-height: 100%;
+  position: absolute;
   right: ${(props) =>
     props.editModeHorizontalAlign === 'right' ? '0' : 'auto'};
+
   top: ${(props) => (props.editModeVerticalPosition === 'over' ? '0' : '100%')};
+  width: 100%;
   z-index: 1;
   ${overlayBackground}
 `;
diff --git a/front/src/modules/ui/components/editable-cell/types/EditableCellDateEditMode.tsx b/front/src/modules/ui/components/editable-cell/types/EditableCellDateEditMode.tsx
index e9ab0e517..40314f365 100644
--- a/front/src/modules/ui/components/editable-cell/types/EditableCellDateEditMode.tsx
+++ b/front/src/modules/ui/components/editable-cell/types/EditableCellDateEditMode.tsx
@@ -1,11 +1,17 @@
+import styled from '@emotion/styled';
 import { Key } from 'ts-key-enum';
 
 import { useScopedHotkeys } from '@/lib/hotkeys/hooks/useScopedHotkeys';
-import { InplaceInputDateEditMode } from '@/ui/inplace-inputs/components/InplaceInputDateEditMode';
+import { InplaceInputDate } from '@/ui/inplace-inputs/components/InplaceInputDate';
 import { TableHotkeyScope } from '@/ui/tables/types/TableHotkeyScope';
 
 import { useEditableCell } from '../hooks/useEditableCell';
 
+const EditableCellDateEditModeContainer = styled.div`
+  margin-top: -1px;
+  width: inherit;
+`;
+
 export type EditableDateProps = {
   value: Date;
   onChange: (date: Date) => void;
@@ -31,5 +37,9 @@ export function EditableCellDateEditMode({
     [closeEditableCell],
   );
 
-  return <InplaceInputDateEditMode onChange={handleDateChange} value={value} />;
+  return (
+    <EditableCellDateEditModeContainer>
+      <InplaceInputDate onChange={handleDateChange} value={value} />
+    </EditableCellDateEditModeContainer>
+  );
 }
diff --git a/front/src/modules/ui/components/links/PrimaryLink.tsx b/front/src/modules/ui/components/links/PrimaryLink.tsx
index 4a8e3ee65..7af61daa8 100644
--- a/front/src/modules/ui/components/links/PrimaryLink.tsx
+++ b/front/src/modules/ui/components/links/PrimaryLink.tsx
@@ -14,7 +14,7 @@ const StyledClickable = styled.div`
   a {
     color: ${({ theme }) => theme.font.color.tertiary};
     font-size: ${({ theme }) => theme.font.size.sm};
-    text-decoration: none;
+    text-decoration: underline;
   }
 `;
 
diff --git a/front/src/modules/ui/components/links/RawLink.tsx b/front/src/modules/ui/components/links/RawLink.tsx
index d8b19f366..b0d397354 100644
--- a/front/src/modules/ui/components/links/RawLink.tsx
+++ b/front/src/modules/ui/components/links/RawLink.tsx
@@ -14,7 +14,6 @@ const StyledClickable = styled.div`
 
   a {
     color: inherit;
-    text-decoration: none;
   }
 `;
 
diff --git a/front/src/modules/ui/components/property-box/PropertyBox.tsx b/front/src/modules/ui/components/property-box/PropertyBox.tsx
index 68784e524..c46da9a25 100644
--- a/front/src/modules/ui/components/property-box/PropertyBox.tsx
+++ b/front/src/modules/ui/components/property-box/PropertyBox.tsx
@@ -7,12 +7,12 @@ const StyledPropertyBoxContainer = styled.div`
   border-radius: ${({ theme }) => theme.border.radius.sm};
   display: flex;
   flex-direction: column;
-  gap: ${({ theme }) => theme.spacing(0.5)};
-  padding: ${({ theme }) => theme.spacing(2)} ${({ theme }) => theme.spacing(3)};
+  gap: ${({ theme }) => theme.spacing(3)};
+  padding: ${({ theme }) => theme.spacing(3)};
 `;
 
 interface PropertyBoxProps {
-  children: JSX.Element;
+  children: React.ReactNode;
   extraPadding?: boolean;
 }
 
diff --git a/front/src/modules/ui/editable-fields/components/EditableField.tsx b/front/src/modules/ui/editable-fields/components/EditableField.tsx
new file mode 100644
index 000000000..34a9537ad
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/components/EditableField.tsx
@@ -0,0 +1,133 @@
+import { useState } from 'react';
+import styled from '@emotion/styled';
+import { motion } from 'framer-motion';
+
+import { HotkeyScope } from '@/lib/hotkeys/types/HotkeyScope';
+
+import { useEditableField } from '../hooks/useEditableField';
+
+import { EditableFieldDisplayMode } from './EditableFieldDisplayMode';
+import { EditableFieldEditButton } from './EditableFieldEditButton';
+import { EditableFieldEditMode } from './EditableFieldEditMode';
+
+const StyledIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+
+  svg {
+    align-items: center;
+    display: flex;
+    height: 16px;
+    justify-content: center;
+    width: 16px;
+  }
+`;
+
+const StyledLabelAndIconContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.tertiary};
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledLabel = styled.div<Pick<OwnProps, 'labelFixedWidth'>>`
+  align-items: center;
+
+  width: ${({ labelFixedWidth }) =>
+    labelFixedWidth ? `${labelFixedWidth}px` : 'fit-content'};
+`;
+
+export const EditableFieldBaseContainer = styled.div`
+  align-items: center;
+  box-sizing: border-box;
+
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+  height: 24px;
+  position: relative;
+  user-select: none;
+
+  width: 100%;
+`;
+
+type OwnProps = {
+  iconLabel?: React.ReactNode;
+  label?: string;
+  labelFixedWidth?: number;
+  useEditButton?: boolean;
+  editModeContent: React.ReactNode;
+  displayModeContent: React.ReactNode;
+  parentHotkeyScope?: HotkeyScope;
+  customEditHotkeyScope?: HotkeyScope;
+  onSubmit?: () => void;
+  onCancel?: () => void;
+};
+
+export function EditableField({
+  iconLabel,
+  label,
+  labelFixedWidth,
+  useEditButton,
+  editModeContent,
+  displayModeContent,
+  parentHotkeyScope,
+  customEditHotkeyScope,
+  onSubmit,
+  onCancel,
+}: OwnProps) {
+  const [isHovered, setIsHovered] = useState(false);
+
+  function handleContainerMouseEnter() {
+    setIsHovered(true);
+  }
+
+  function handleContainerMouseLeave() {
+    setIsHovered(false);
+  }
+
+  const { isFieldInEditMode, openEditableField } =
+    useEditableField(parentHotkeyScope);
+
+  function handleDisplayModeClick() {
+    openEditableField(customEditHotkeyScope);
+  }
+
+  const showEditButton = !isFieldInEditMode && isHovered && useEditButton;
+
+  return (
+    <EditableFieldBaseContainer
+      onMouseEnter={handleContainerMouseEnter}
+      onMouseLeave={handleContainerMouseLeave}
+    >
+      <StyledLabelAndIconContainer>
+        {iconLabel && <StyledIconContainer>{iconLabel}</StyledIconContainer>}
+        {label && (
+          <StyledLabel labelFixedWidth={labelFixedWidth}>{label}</StyledLabel>
+        )}
+      </StyledLabelAndIconContainer>
+      {isFieldInEditMode ? (
+        <EditableFieldEditMode onSubmit={onSubmit} onCancel={onCancel}>
+          {editModeContent}
+        </EditableFieldEditMode>
+      ) : (
+        <EditableFieldDisplayMode
+          disableClick={useEditButton}
+          onClick={handleDisplayModeClick}
+        >
+          {displayModeContent}
+        </EditableFieldDisplayMode>
+      )}
+      {showEditButton && (
+        <motion.div
+          initial={{ opacity: 0 }}
+          animate={{ opacity: 1 }}
+          transition={{ duration: 0.1 }}
+          whileHover={{ scale: 1.04 }}
+        >
+          <EditableFieldEditButton customHotkeyScope={customEditHotkeyScope} />
+        </motion.div>
+      )}
+    </EditableFieldBaseContainer>
+  );
+}
diff --git a/front/src/modules/ui/editable-fields/components/EditableFieldDisplayMode.tsx b/front/src/modules/ui/editable-fields/components/EditableFieldDisplayMode.tsx
new file mode 100644
index 000000000..60f0bc5a3
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/components/EditableFieldDisplayMode.tsx
@@ -0,0 +1,71 @@
+import { css } from '@emotion/react';
+import styled from '@emotion/styled';
+
+export const EditableFieldNormalModeOuterContainer = styled.div<
+  Pick<OwnProps, 'disableClick'>
+>`
+  align-items: center;
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  display: flex;
+  height: 100%;
+
+  height: 16px;
+
+  overflow: hidden;
+
+  padding: ${({ theme }) => theme.spacing(1)};
+
+  width: 100%;
+
+  ${(props) => {
+    if (props.disableClick) {
+      return css`
+        cursor: default;
+      `;
+    } else {
+      return css`
+        cursor: pointer;
+
+        &:hover {
+          background-color: ${props.theme.background.transparent.light};
+        }
+      `;
+    }
+  }}
+`;
+
+export const EditableFieldNormalModeInnerContainer = styled.div`
+  align-items: center;
+  color: ${({ theme }) => theme.font.color.primary};
+  font-size: ${({ theme }) => theme.font.size.md};
+  font-weight: ${({ theme }) => theme.font.weight.regular};
+
+  height: fit-content;
+
+  overflow: hidden;
+
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`;
+
+type OwnProps = {
+  disableClick?: boolean;
+  onClick?: () => void;
+};
+
+export function EditableFieldDisplayMode({
+  children,
+  disableClick,
+  onClick,
+}: React.PropsWithChildren<OwnProps>) {
+  return (
+    <EditableFieldNormalModeOuterContainer
+      onClick={disableClick ? undefined : onClick}
+      disableClick={disableClick}
+    >
+      <EditableFieldNormalModeInnerContainer>
+        {children}
+      </EditableFieldNormalModeInnerContainer>
+    </EditableFieldNormalModeOuterContainer>
+  );
+}
diff --git a/front/src/modules/ui/editable-fields/components/EditableFieldEditButton.tsx b/front/src/modules/ui/editable-fields/components/EditableFieldEditButton.tsx
new file mode 100644
index 000000000..d9a9f9945
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/components/EditableFieldEditButton.tsx
@@ -0,0 +1,49 @@
+import styled from '@emotion/styled';
+import { IconPencil } from '@tabler/icons-react';
+
+import { HotkeyScope } from '@/lib/hotkeys/types/HotkeyScope';
+import { IconButton } from '@/ui/components/buttons/IconButton';
+import { overlayBackground } from '@/ui/themes/effects';
+
+import { useEditableField } from '../hooks/useEditableField';
+
+export const StyledEditableFieldEditButton = styled.div`
+  align-items: center;
+  border: 1px solid ${({ theme }) => theme.border.color.light};
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+
+  color: ${({ theme }) => theme.font.color.tertiary};
+
+  cursor: pointer;
+  display: flex;
+  height: 20px;
+  justify-content: center;
+
+  margin-left: -2px;
+  width: 20px;
+
+  z-index: 1;
+  ${overlayBackground}
+`;
+
+type OwnProps = {
+  customHotkeyScope?: HotkeyScope;
+};
+
+export function EditableFieldEditButton({ customHotkeyScope }: OwnProps) {
+  const { openEditableField } = useEditableField();
+
+  function handleClick() {
+    openEditableField(customHotkeyScope);
+  }
+
+  return (
+    <IconButton
+      variant="shadow"
+      size="small"
+      onClick={handleClick}
+      icon={<IconPencil size={14} />}
+      data-testid="editable-field-edit-mode-container"
+    />
+  );
+}
diff --git a/front/src/modules/ui/editable-fields/components/EditableFieldEditMode.tsx b/front/src/modules/ui/editable-fields/components/EditableFieldEditMode.tsx
new file mode 100644
index 000000000..e40e2dede
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/components/EditableFieldEditMode.tsx
@@ -0,0 +1,41 @@
+import { useRef } from 'react';
+import styled from '@emotion/styled';
+
+import { useRegisterCloseFieldHandlers } from '../hooks/useRegisterCloseFieldHandlers';
+
+export const EditableFieldEditModeContainer = styled.div<OwnProps>`
+  align-items: center;
+
+  display: flex;
+
+  margin-left: -${({ theme }) => theme.spacing(1)};
+
+  width: inherit;
+  z-index: 10;
+`;
+
+type OwnProps = {
+  children: React.ReactNode;
+  onOutsideClick?: () => void;
+  onCancel?: () => void;
+  onSubmit?: () => void;
+};
+
+export function EditableFieldEditMode({
+  children,
+  onCancel,
+  onSubmit,
+}: OwnProps) {
+  const wrapperRef = useRef(null);
+
+  useRegisterCloseFieldHandlers(wrapperRef, onSubmit, onCancel);
+
+  return (
+    <EditableFieldEditModeContainer
+      data-testid="editable-field-edit-mode-container"
+      ref={wrapperRef}
+    >
+      {children}
+    </EditableFieldEditModeContainer>
+  );
+}
diff --git a/front/src/modules/ui/editable-fields/components/EditableFieldEntityText.tsx b/front/src/modules/ui/editable-fields/components/EditableFieldEntityText.tsx
new file mode 100644
index 000000000..f944f9418
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/components/EditableFieldEntityText.tsx
@@ -0,0 +1,60 @@
+import { useEffect, useState } from 'react';
+import { IconMap } from '@tabler/icons-react';
+
+import { RecoilScope } from '@/recoil-scope/components/RecoilScope';
+import { EditableField } from '@/ui/editable-fields/components/EditableField';
+import { FieldContext } from '@/ui/editable-fields/states/FieldContext';
+import { InplaceInputText } from '@/ui/inplace-inputs/components/InplaceInputText';
+import { Company, useUpdateCompanyMutation } from '~/generated/graphql';
+
+type OwnProps = {
+  company: Pick<Company, 'id' | 'address'>;
+};
+
+export function CompanyEditableFieldAddress({ company }: OwnProps) {
+  const [internalValue, setInternalValue] = useState(company.address);
+
+  const [updateCompany] = useUpdateCompanyMutation();
+
+  useEffect(() => {
+    setInternalValue(company.address);
+  }, [company.address]);
+
+  async function handleChange(newValue: string) {
+    setInternalValue(newValue);
+  }
+
+  async function handleSubmit() {
+    await updateCompany({
+      variables: {
+        id: company.id,
+        address: internalValue ?? '',
+      },
+    });
+  }
+
+  async function handleCancel() {
+    setInternalValue(company.address);
+  }
+
+  return (
+    <RecoilScope SpecificContext={FieldContext}>
+      <EditableField
+        onSubmit={handleSubmit}
+        onCancel={handleCancel}
+        iconLabel={<IconMap />}
+        editModeContent={
+          <InplaceInputText
+            placeholder={'Address'}
+            autoFocus
+            value={internalValue}
+            onChange={(newValue: string) => {
+              handleChange(newValue);
+            }}
+          />
+        }
+        displayModeContent={internalValue !== '' ? internalValue : 'No address'}
+      />
+    </RecoilScope>
+  );
+}
diff --git a/front/src/modules/ui/editable-fields/components/FieldDisplayURL.tsx b/front/src/modules/ui/editable-fields/components/FieldDisplayURL.tsx
new file mode 100644
index 000000000..54b3b3f6f
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/components/FieldDisplayURL.tsx
@@ -0,0 +1,5 @@
+import { RawLink } from '@/ui/components/links/RawLink';
+
+export function FieldDisplayURL({ URL }: { URL: string | undefined }) {
+  return <RawLink href={URL ? 'https://' + URL : ''}>{URL}</RawLink>;
+}
diff --git a/front/src/modules/ui/editable-fields/hooks/useEditableField.ts b/front/src/modules/ui/editable-fields/hooks/useEditableField.ts
new file mode 100644
index 000000000..d158b4d47
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/hooks/useEditableField.ts
@@ -0,0 +1,41 @@
+import { useSetHotkeyScope } from '@/lib/hotkeys/hooks/useSetHotkeyScope';
+import { HotkeyScope } from '@/lib/hotkeys/types/HotkeyScope';
+import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState';
+
+import { FieldContext } from '../states/FieldContext';
+import { isFieldInEditModeScopedState } from '../states/isFieldInEditModeScopedState';
+import { EditableFieldHotkeyScope } from '../types/EditableFieldHotkeyScope';
+
+// TODO: use atoms for hotkey scopes
+export function useEditableField(parentHotkeyScope?: HotkeyScope) {
+  const [isFieldInEditMode, setIsFieldInEditMode] = useRecoilScopedState(
+    isFieldInEditModeScopedState,
+    FieldContext,
+  );
+
+  const setHotkeyScope = useSetHotkeyScope();
+
+  function closeEditableField() {
+    setIsFieldInEditMode(false);
+
+    if (parentHotkeyScope) {
+      setHotkeyScope(parentHotkeyScope.scope, parentHotkeyScope.customScopes);
+    }
+  }
+
+  function openEditableField(customHotkeyScope?: HotkeyScope) {
+    setIsFieldInEditMode(true);
+
+    if (customHotkeyScope) {
+      setHotkeyScope(customHotkeyScope.scope, customHotkeyScope.customScopes);
+    } else {
+      setHotkeyScope(EditableFieldHotkeyScope.EditableField);
+    }
+  }
+
+  return {
+    isFieldInEditMode,
+    closeEditableField,
+    openEditableField,
+  };
+}
diff --git a/front/src/modules/ui/editable-fields/hooks/useRegisterCloseFieldHandlers.ts b/front/src/modules/ui/editable-fields/hooks/useRegisterCloseFieldHandlers.ts
new file mode 100644
index 000000000..3890b1b97
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/hooks/useRegisterCloseFieldHandlers.ts
@@ -0,0 +1,41 @@
+import { useScopedHotkeys } from '@/lib/hotkeys/hooks/useScopedHotkeys';
+import { useListenClickOutsideArrayOfRef } from '@/ui/hooks/useListenClickOutsideArrayOfRef';
+
+import { EditableFieldHotkeyScope } from '../types/EditableFieldHotkeyScope';
+
+import { useEditableField } from './useEditableField';
+
+export function useRegisterCloseFieldHandlers(
+  wrapperRef: React.RefObject<HTMLDivElement>,
+  onSubmit?: () => void,
+  onCancel?: () => void,
+) {
+  const { closeEditableField, isFieldInEditMode } = useEditableField();
+
+  useListenClickOutsideArrayOfRef([wrapperRef], () => {
+    if (isFieldInEditMode) {
+      onSubmit?.();
+      closeEditableField();
+    }
+  });
+
+  useScopedHotkeys(
+    'enter',
+    () => {
+      onSubmit?.();
+      closeEditableField();
+    },
+    EditableFieldHotkeyScope.EditableField,
+    [closeEditableField, onSubmit],
+  );
+
+  useScopedHotkeys(
+    'esc',
+    () => {
+      closeEditableField();
+      onCancel?.();
+    },
+    EditableFieldHotkeyScope.EditableField,
+    [closeEditableField, onCancel],
+  );
+}
diff --git a/front/src/modules/ui/editable-fields/states/FieldContext.ts b/front/src/modules/ui/editable-fields/states/FieldContext.ts
new file mode 100644
index 000000000..5e115242f
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/states/FieldContext.ts
@@ -0,0 +1,3 @@
+import { createContext } from 'react';
+
+export const FieldContext = createContext<string | null>(null);
diff --git a/front/src/modules/ui/editable-fields/states/isFieldInEditModeScopedState.ts b/front/src/modules/ui/editable-fields/states/isFieldInEditModeScopedState.ts
new file mode 100644
index 000000000..9a32f6fa9
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/states/isFieldInEditModeScopedState.ts
@@ -0,0 +1,6 @@
+import { atomFamily } from 'recoil';
+
+export const isFieldInEditModeScopedState = atomFamily<boolean, string>({
+  key: 'isFieldInEditModeScopedState',
+  default: false,
+});
diff --git a/front/src/modules/ui/editable-fields/types/EditableFieldHotkeyScope.ts b/front/src/modules/ui/editable-fields/types/EditableFieldHotkeyScope.ts
new file mode 100644
index 000000000..309495c8f
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/types/EditableFieldHotkeyScope.ts
@@ -0,0 +1,3 @@
+export enum EditableFieldHotkeyScope {
+  EditableField = 'editable-field',
+}
diff --git a/front/src/modules/ui/editable-fields/variants/components/EditableFieldEditModeDate.tsx b/front/src/modules/ui/editable-fields/variants/components/EditableFieldEditModeDate.tsx
new file mode 100644
index 000000000..507be9602
--- /dev/null
+++ b/front/src/modules/ui/editable-fields/variants/components/EditableFieldEditModeDate.tsx
@@ -0,0 +1,33 @@
+import { HotkeyScope } from '@/lib/hotkeys/types/HotkeyScope';
+import { InplaceInputDate } from '@/ui/inplace-inputs/components/InplaceInputDate';
+import { parseDate } from '@/utils/datetime/date-utils';
+
+import { useEditableField } from '../../hooks/useEditableField';
+
+type OwnProps = {
+  value: string;
+  onChange?: (newValue: string) => void;
+  parentHotkeyScope?: HotkeyScope;
+};
+
+export function EditableFieldEditModeDate({
+  value,
+  onChange,
+  parentHotkeyScope,
+}: OwnProps) {
+  const { closeEditableField } = useEditableField(parentHotkeyScope);
+
+  function handleChange(newValue: string) {
+    onChange?.(newValue);
+    closeEditableField();
+  }
+
+  return (
+    <InplaceInputDate
+      value={parseDate(value).toJSDate()}
+      onChange={(newDate: Date) => {
+        handleChange(newDate.toISOString());
+      }}
+    />
+  );
+}
diff --git a/front/src/modules/ui/inplace-inputs/components/InplaceInputContainer.tsx b/front/src/modules/ui/inplace-inputs/components/InplaceInputContainer.tsx
new file mode 100644
index 000000000..075299655
--- /dev/null
+++ b/front/src/modules/ui/inplace-inputs/components/InplaceInputContainer.tsx
@@ -0,0 +1,17 @@
+import styled from '@emotion/styled';
+
+import { overlayBackground } from '@/ui/themes/effects';
+
+export const InplaceInputContainer = styled.div`
+  align-items: center;
+  border: 1px solid ${({ theme }) => theme.border.color.medium};
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  display: flex;
+  margin-left: -1px;
+  min-height: 32px;
+  width: inherit;
+
+  ${overlayBackground}
+
+  z-index: 10;
+`;
diff --git a/front/src/modules/ui/inplace-inputs/components/InplaceInputDateEditMode.tsx b/front/src/modules/ui/inplace-inputs/components/InplaceInputDate.tsx
similarity index 62%
rename from front/src/modules/ui/inplace-inputs/components/InplaceInputDateEditMode.tsx
rename to front/src/modules/ui/inplace-inputs/components/InplaceInputDate.tsx
index 11f32a99e..3d27e4869 100644
--- a/front/src/modules/ui/inplace-inputs/components/InplaceInputDateEditMode.tsx
+++ b/front/src/modules/ui/inplace-inputs/components/InplaceInputDate.tsx
@@ -2,36 +2,40 @@ import { forwardRef } from 'react';
 import styled from '@emotion/styled';
 
 import DatePicker from '@/ui/components/form/DatePicker';
-import { humanReadableDate } from '@/utils/utils';
+import { formatToHumanReadableDate } from '@/utils/utils';
 
-const StyledContainer = styled.div`
-  align-items: center;
-  display: flex;
-  margin: 0px ${({ theme }) => theme.spacing(2)};
-`;
+import { InplaceInputContainer } from './InplaceInputContainer';
 
 export type StyledCalendarContainerProps = {
   editModeHorizontalAlign?: 'left' | 'right';
 };
 
+const StyledInputContainer = styled.div`
+  display: flex;
+
+  padding: ${({ theme }) => theme.spacing(2)};
+`;
+
 const StyledCalendarContainer = styled.div<StyledCalendarContainerProps>`
   background: ${({ theme }) => theme.background.secondary};
   border: 1px solid ${({ theme }) => theme.border.color.light};
   border-radius: ${({ theme }) => theme.border.radius.md};
   box-shadow: ${({ theme }) => theme.boxShadow.strong};
-  left: -10px;
+
+  margin-top: 1px;
+
   position: absolute;
-  top: 10px;
+
   z-index: 1;
 `;
 
 type DivProps = React.HTMLProps<HTMLDivElement>;
 
-const DateDisplay = forwardRef<HTMLDivElement, DivProps>(
+export const DateDisplay = forwardRef<HTMLDivElement, DivProps>(
   ({ value, onClick }, ref) => (
-    <div onClick={onClick} ref={ref}>
-      {value && humanReadableDate(new Date(value as string))}
-    </div>
+    <StyledInputContainer onClick={onClick} ref={ref}>
+      {value && formatToHumanReadableDate(new Date(value as string))}
+    </StyledInputContainer>
   ),
 );
 
@@ -39,7 +43,7 @@ type DatePickerContainerProps = {
   children: React.ReactNode;
 };
 
-const DatePickerContainer = ({ children }: DatePickerContainerProps) => {
+export const DatePickerContainer = ({ children }: DatePickerContainerProps) => {
   return <StyledCalendarContainer>{children}</StyledCalendarContainer>;
 };
 
@@ -48,15 +52,15 @@ type OwnProps = {
   onChange: (newDate: Date) => void;
 };
 
-export function InplaceInputDateEditMode({ onChange, value }: OwnProps) {
+export function InplaceInputDate({ onChange, value }: OwnProps) {
   return (
-    <StyledContainer>
+    <InplaceInputContainer>
       <DatePicker
         date={value}
         onChangeHandler={onChange}
         customInput={<DateDisplay />}
         customCalendarContainer={DatePickerContainer}
       />
-    </StyledContainer>
+    </InplaceInputContainer>
   );
 }
diff --git a/front/src/modules/ui/inplace-inputs/components/InplaceInputDateDisplayMode.tsx b/front/src/modules/ui/inplace-inputs/components/InplaceInputDateDisplayMode.tsx
index 5a9f826fa..eb1b949fe 100644
--- a/front/src/modules/ui/inplace-inputs/components/InplaceInputDateDisplayMode.tsx
+++ b/front/src/modules/ui/inplace-inputs/components/InplaceInputDateDisplayMode.tsx
@@ -1,9 +1,9 @@
-import { humanReadableDate } from '@/utils/utils';
+import { formatToHumanReadableDate } from '@/utils/utils';
 
 type OwnProps = {
   value: Date;
 };
 
 export function InplaceInputDateDisplayMode({ value }: OwnProps) {
-  return <div>{value && humanReadableDate(value)}</div>;
+  return <div>{value && formatToHumanReadableDate(value)}</div>;
 }
diff --git a/front/src/modules/ui/inplace-inputs/components/InplaceInputText.tsx b/front/src/modules/ui/inplace-inputs/components/InplaceInputText.tsx
new file mode 100644
index 000000000..5c84c64a4
--- /dev/null
+++ b/front/src/modules/ui/inplace-inputs/components/InplaceInputText.tsx
@@ -0,0 +1,36 @@
+import styled from '@emotion/styled';
+
+import { textInputStyle } from '@/ui/themes/effects';
+
+import { InplaceInputContainer } from './InplaceInputContainer';
+
+export const InplaceInputTextInput = styled.input`
+  margin: 0;
+  width: 100%;
+  ${textInputStyle}
+`;
+
+type OwnProps = {
+  placeholder?: string;
+  value?: string;
+  onChange?: (newValue: string) => void;
+  autoFocus?: boolean;
+};
+
+export function InplaceInputText({
+  placeholder,
+  value,
+  onChange,
+  autoFocus,
+}: OwnProps) {
+  return (
+    <InplaceInputContainer>
+      <InplaceInputTextInput
+        autoFocus={autoFocus}
+        placeholder={placeholder}
+        value={value}
+        onChange={(e) => onChange?.(e.target.value)}
+      />
+    </InplaceInputContainer>
+  );
+}
diff --git a/front/src/modules/ui/themes/effects.ts b/front/src/modules/ui/themes/effects.ts
index 3f5575127..46e45414b 100644
--- a/front/src/modules/ui/themes/effects.ts
+++ b/front/src/modules/ui/themes/effects.ts
@@ -9,11 +9,15 @@ export const overlayBackground = (props: { theme: ThemeType }) =>
     box-shadow: ${props.theme.boxShadow.strong};
   `;
 
-export const textInputStyle = (props: any) =>
+export const textInputStyle = (props: { theme: ThemeType }) =>
   css`
     background-color: transparent;
     border: none;
     color: ${props.theme.font.color.primary};
+    font-family: ${props.theme.font.family};
+    font-size: ${props.theme.font.size.md};
+
+    font-weight: ${props.theme.font.weight.regular};
     outline: none;
     padding: ${props.theme.spacing(0)} ${props.theme.spacing(2)};
 
diff --git a/front/src/modules/utils/utils.ts b/front/src/modules/utils/utils.ts
index c05fa5ce8..0831916e3 100644
--- a/front/src/modules/utils/utils.ts
+++ b/front/src/modules/utils/utils.ts
@@ -1,10 +1,14 @@
-export const humanReadableDate = (date: Date) => {
+import { parseDate } from './datetime/date-utils';
+
+export function formatToHumanReadableDate(date: Date | string) {
+  const parsedJSDate = parseDate(date).toJSDate();
+
   return new Intl.DateTimeFormat(undefined, {
     month: 'short',
     day: 'numeric',
     year: 'numeric',
-  }).format(date);
-};
+  }).format(parsedJSDate);
+}
 
 export const getLogoUrlFromDomainName = (domainName?: string): string => {
   return `https://api.faviconkit.com/${domainName}/144`;
diff --git a/front/src/pages/companies/CompanyShow.tsx b/front/src/pages/companies/CompanyShow.tsx
index fdcec17b7..4da987e95 100644
--- a/front/src/pages/companies/CompanyShow.tsx
+++ b/front/src/pages/companies/CompanyShow.tsx
@@ -2,11 +2,14 @@ import { useParams } from 'react-router-dom';
 import { useTheme } from '@emotion/react';
 
 import { Timeline } from '@/comments/components/timeline/Timeline';
+import { CompanyAccountOwnerEditableField } from '@/companies/fields/components/CompanyAccountOwnerEditableField';
+import { CompanyAddressEditableField } from '@/companies/fields/components/CompanyAddressEditableField';
+import { CompanyCreatedAtEditableField } from '@/companies/fields/components/CompanyCreatedAtEditableField';
+import { CompanyDomainNameEditableField } from '@/companies/fields/components/CompanyDomainNameEditableField';
+import { CompanyEmployeesEditableField } from '@/companies/fields/components/CompanyEmployeesEditableField';
 import { useCompanyQuery } from '@/companies/services';
-import { RawLink } from '@/ui/components/links/RawLink';
 import { PropertyBox } from '@/ui/components/property-box/PropertyBox';
-import { PropertyBoxItem } from '@/ui/components/property-box/PropertyBoxItem';
-import { IconBuildingSkyscraper, IconLink, IconMap } from '@/ui/icons/index';
+import { IconBuildingSkyscraper } from '@/ui/icons/index';
 import { WithTopBarContainer } from '@/ui/layout/containers/WithTopBarContainer';
 import { ShowPageLeftContainer } from '@/ui/layout/show-page/containers/ShowPageLeftContainer';
 import { ShowPageRightContainer } from '@/ui/layout/show-page/containers/ShowPageRightContainer';
@@ -22,48 +25,33 @@ export function CompanyShow() {
 
   const theme = useTheme();
 
+  if (!company) return <></>;
+
   return (
     <WithTopBarContainer
       title={company?.name ?? ''}
       icon={<IconBuildingSkyscraper size={theme.icon.size.md} />}
     >
-      <>
-        <ShowPageLeftContainer>
-          <ShowPageSummaryCard
-            id={company?.id}
-            logoOrAvatar={getLogoUrlFromDomainName(company?.domainName ?? '')}
-            title={company?.name ?? 'No name'}
-            date={company?.createdAt ?? ''}
-          />
-          <PropertyBox extraPadding={true}>
-            <>
-              <PropertyBoxItem
-                icon={<IconLink />}
-                value={
-                  <RawLink
-                    href={
-                      company?.domainName
-                        ? 'https://' + company?.domainName
-                        : ''
-                    }
-                  >
-                    {company?.domainName}
-                  </RawLink>
-                }
-              />
-              <PropertyBoxItem
-                icon={<IconMap />}
-                value={company?.address ? company?.address : 'No address'}
-              />
-            </>
-          </PropertyBox>
-        </ShowPageLeftContainer>
-        <ShowPageRightContainer>
-          <Timeline
-            entity={{ id: company?.id ?? '', type: CommentableType.Company }}
-          />
-        </ShowPageRightContainer>
-      </>
+      <ShowPageLeftContainer>
+        <ShowPageSummaryCard
+          id={company?.id}
+          logoOrAvatar={getLogoUrlFromDomainName(company?.domainName ?? '')}
+          title={company?.name ?? 'No name'}
+          date={company?.createdAt ?? ''}
+        />
+        <PropertyBox extraPadding={true}>
+          <CompanyDomainNameEditableField company={company} />
+          <CompanyAccountOwnerEditableField company={company} />
+          <CompanyEmployeesEditableField company={company} />
+          <CompanyAddressEditableField company={company} />
+          <CompanyCreatedAtEditableField company={company} />
+        </PropertyBox>
+      </ShowPageLeftContainer>
+      <ShowPageRightContainer>
+        <Timeline
+          entity={{ id: company?.id ?? '', type: CommentableType.Company }}
+        />
+      </ShowPageRightContainer>
     </WithTopBarContainer>
   );
 }