diff --git a/src/components/EntryForm.tsx b/src/components/EntryForm.tsx
index ce6257a08..c6dfc688f 100644
--- a/src/components/EntryForm.tsx
+++ b/src/components/EntryForm.tsx
@@ -5,7 +5,7 @@ import {
   UseFormRegister,
   FieldValues,
 } from 'react-hook-form';
-import Image from 'next/legacy/image';
+import Image from 'next/image';
 import Radio from '../design-system/components/RadioInput';
 import isFunction from 'lodash/isFunction';
 import omit from 'lodash/omit';
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index e1fa27e5b..ffb7ac91a 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -3,7 +3,7 @@ import Link from 'next/link';
 
 import Box from './Box';
 import Text from './Text';
-import Image from 'next/legacy/image';
+import Image from 'next/image';
 
 import poweredByVercel from '../../public/powered-by-vercel.svg';
 
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 69ef2bd3b..0e837f5bf 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -15,7 +15,6 @@ import dynamic from 'next/dynamic';
 import { useFeedbackPopover } from './hooks';
 import Text from '../Text';
 
-// const Feedback = dynamic(() => import('../Feedback/Feedback'));
 const Drawer = dynamic(() => import('../../design-system/components/Drawer'));
 
 const Header = ({ children }) => {
diff --git a/src/components/ToiletDetailsPanel.tsx b/src/components/ToiletDetailsPanel.tsx
index fb15dfc50..a72de2f84 100644
--- a/src/components/ToiletDetailsPanel.tsx
+++ b/src/components/ToiletDetailsPanel.tsx
@@ -238,11 +238,7 @@ const ToiletDetailsPanel: React.FC<ToiletDetailsPanelProps> = ({
         </Box>
         <Spacer mb={[0, 2]} />
         Last {verifiedOrUpdated}:{' '}
-        <Link
-          href={`/explorer/loos/${data.id}`}
-          prefetch={false}
-          legacyBehavior
-        >
+        <Link href={`/explorer/loos/${data.id}`} prefetch={false}>
           {lightFormat(verifiedOrUpdatedDate, 'dd/MM/yyyy, hh:mm aa')}
         </Link>
       </Box>
diff --git a/src/design-system/components/Logo/Logo.css b/src/design-system/components/Logo/Logo.css
index 618a5eaba..0398bedd6 100644
--- a/src/design-system/components/Logo/Logo.css
+++ b/src/design-system/components/Logo/Logo.css
@@ -1,3 +1,8 @@
 .logo {
-    width: 154px;
-}
\ No newline at end of file
+  width: 154px;
+}
+
+.logo > img {
+  width: auto;
+  height: auto;
+}
diff --git a/src/design-system/components/Logo/Logo.tsx b/src/design-system/components/Logo/Logo.tsx
index f43f0aea6..39122396f 100644
--- a/src/design-system/components/Logo/Logo.tsx
+++ b/src/design-system/components/Logo/Logo.tsx
@@ -7,7 +7,6 @@ const Logo = React.forwardRef<HTMLDivElement>((props, ref) => (
     <Image
       src={logo}
       alt="The Great British Toilet Map"
-      layout="responsive"
       unoptimized={!!process.env.STORYBOOK}
       priority={true}
       {...props}