diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx
index 9607d0b3a8..30ddac286a 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx
@@ -646,28 +646,31 @@ export const PaginatedProjectFeatureToggles = ({
                         />
                     </SearchHighlightProvider>
 
-                    <ConditionallyRender
-                        condition={rows.length === 0}
-                        show={
-                            <ConditionallyRender
-                                condition={searchValue?.length > 0}
-                                show={
-                                    <TablePlaceholder>
-                                        No feature toggles found matching
-                                        &ldquo;
-                                        {searchValue}
-                                        &rdquo;
-                                    </TablePlaceholder>
-                                }
-                                elseShow={
-                                    <TablePlaceholder>
-                                        No feature toggles available. Get
-                                        started by adding a new feature toggle.
-                                    </TablePlaceholder>
-                                }
-                            />
-                        }
-                    />
+                    <Box sx={{ padding: theme.spacing(3) }}>
+                        <ConditionallyRender
+                            condition={rows.length === 0}
+                            show={
+                                <ConditionallyRender
+                                    condition={searchValue?.length > 0}
+                                    show={
+                                        <TablePlaceholder>
+                                            No feature toggles found matching
+                                            &ldquo;
+                                            {searchValue}
+                                            &rdquo;
+                                        </TablePlaceholder>
+                                    }
+                                    elseShow={
+                                        <TablePlaceholder>
+                                            No feature toggles available. Get
+                                            started by adding a new feature
+                                            toggle.
+                                        </TablePlaceholder>
+                                    }
+                                />
+                            }
+                        />
+                    </Box>
                     <FeatureStaleDialog
                         isStale={featureStaleDialogState.stale === true}
                         isOpen={Boolean(featureStaleDialogState.featureId)}
diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
index 9bd2fbcf3f..51ba6b7154 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx
@@ -6,6 +6,7 @@ import {
     Tooltip,
     useMediaQuery,
     useTheme,
+    Box,
 } from '@mui/material';
 import { Add } from '@mui/icons-material';
 import { useNavigate, useSearchParams } from 'react-router-dom';
@@ -172,6 +173,9 @@ export const ProjectFeatureToggles = ({
                 maxWidth: 50,
                 disableSortBy: true,
                 hideInMenu: true,
+                styles: {
+                    borderRadius: 0,
+                },
             },
             {
                 id: 'favorite',
@@ -304,6 +308,9 @@ export const ProjectFeatureToggles = ({
                 ),
                 disableSortBy: true,
                 hideInMenu: true,
+                styles: {
+                    borderRadius: 0,
+                },
             },
         ],
         [projectId, environments, loading],
@@ -497,92 +504,118 @@ export const ProjectFeatureToggles = ({
         <>
             <PageContent
                 isLoading={loading}
+                disablePadding
                 className={styles.container}
                 header={
-                    <PageHeader
-                        titleElement={
-                            showTitle
-                                ? `Feature toggles (${total || rows.length})`
-                                : null
-                        }
-                        actions={
-                            <>
-                                <ConditionallyRender
-                                    condition={!isSmallScreen}
-                                    show={
-                                        <Search
-                                            placeholder='Search and Filter'
-                                            expandable
-                                            initialValue={searchValue}
-                                            onChange={setSearchValue}
-                                            onFocus={() => setShowTitle(false)}
-                                            onBlur={() => setShowTitle(true)}
-                                            hasFilters
-                                            getSearchContext={getSearchContext}
-                                            id='projectFeatureToggles'
-                                        />
-                                    }
-                                />
-                                <ColumnsMenu
-                                    allColumns={allColumns}
-                                    staticColumns={staticColumns}
-                                    dividerAfter={['createdAt']}
-                                    dividerBefore={['Actions']}
-                                    isCustomized={Boolean(storedParams.columns)}
-                                    setHiddenColumns={setHiddenColumns}
-                                />
-                                <PageHeader.Divider sx={{ marginLeft: 0 }} />
-                                <ConditionallyRender
-                                    condition={Boolean(
-                                        uiConfig?.flags?.featuresExportImport,
-                                    )}
-                                    show={
-                                        <Tooltip
-                                            title='Export toggles visible in the table below'
-                                            arrow
-                                        >
-                                            <IconButton
-                                                onClick={() =>
-                                                    setShowExportDialog(true)
-                                                }
-                                                sx={(theme) => ({
-                                                    marginRight:
-                                                        theme.spacing(2),
-                                                })}
-                                            >
-                                                <FileDownload />
-                                            </IconButton>
-                                        </Tooltip>
-                                    }
-                                />
-                                <StyledResponsiveButton
-                                    onClick={() =>
-                                        navigate(getCreateTogglePath(projectId))
-                                    }
-                                    maxWidth='960px'
-                                    Icon={Add}
-                                    projectId={projectId}
-                                    permission={CREATE_FEATURE}
-                                    data-testid='NAVIGATE_TO_CREATE_FEATURE'
-                                >
-                                    New feature toggle
-                                </StyledResponsiveButton>
-                            </>
-                        }
+                    <Box
+                        sx={(theme) => ({
+                            padding: `${theme.spacing(2.5)} ${theme.spacing(
+                                3.125,
+                            )}`,
+                        })}
                     >
-                        <ConditionallyRender
-                            condition={isSmallScreen}
-                            show={
-                                <Search
-                                    initialValue={searchValue}
-                                    onChange={setSearchValue}
-                                    hasFilters
-                                    getSearchContext={getSearchContext}
-                                    id='projectFeatureToggles'
-                                />
+                        <PageHeader
+                            titleElement={
+                                showTitle
+                                    ? `Feature toggles (${
+                                          total || rows.length
+                                      })`
+                                    : null
                             }
-                        />
-                    </PageHeader>
+                            actions={
+                                <>
+                                    <ConditionallyRender
+                                        condition={!isSmallScreen}
+                                        show={
+                                            <Search
+                                                placeholder='Search and Filter'
+                                                expandable
+                                                initialValue={searchValue}
+                                                onChange={setSearchValue}
+                                                onFocus={() =>
+                                                    setShowTitle(false)
+                                                }
+                                                onBlur={() =>
+                                                    setShowTitle(true)
+                                                }
+                                                hasFilters
+                                                getSearchContext={
+                                                    getSearchContext
+                                                }
+                                                id='projectFeatureToggles'
+                                            />
+                                        }
+                                    />
+                                    <ColumnsMenu
+                                        allColumns={allColumns}
+                                        staticColumns={staticColumns}
+                                        dividerAfter={['createdAt']}
+                                        dividerBefore={['Actions']}
+                                        isCustomized={Boolean(
+                                            storedParams.columns,
+                                        )}
+                                        setHiddenColumns={setHiddenColumns}
+                                    />
+                                    <PageHeader.Divider
+                                        sx={{ marginLeft: 0 }}
+                                    />
+                                    <ConditionallyRender
+                                        condition={Boolean(
+                                            uiConfig?.flags
+                                                ?.featuresExportImport,
+                                        )}
+                                        show={
+                                            <Tooltip
+                                                title='Export toggles visible in the table below'
+                                                arrow
+                                            >
+                                                <IconButton
+                                                    onClick={() =>
+                                                        setShowExportDialog(
+                                                            true,
+                                                        )
+                                                    }
+                                                    sx={(theme) => ({
+                                                        marginRight:
+                                                            theme.spacing(2),
+                                                    })}
+                                                >
+                                                    <FileDownload />
+                                                </IconButton>
+                                            </Tooltip>
+                                        }
+                                    />
+                                    <StyledResponsiveButton
+                                        onClick={() =>
+                                            navigate(
+                                                getCreateTogglePath(projectId),
+                                            )
+                                        }
+                                        maxWidth='960px'
+                                        Icon={Add}
+                                        projectId={projectId}
+                                        permission={CREATE_FEATURE}
+                                        data-testid='NAVIGATE_TO_CREATE_FEATURE'
+                                    >
+                                        New feature toggle
+                                    </StyledResponsiveButton>
+                                </>
+                            }
+                        >
+                            <ConditionallyRender
+                                condition={isSmallScreen}
+                                show={
+                                    <Search
+                                        initialValue={searchValue}
+                                        onChange={setSearchValue}
+                                        hasFilters
+                                        getSearchContext={getSearchContext}
+                                        id='projectFeatureToggles'
+                                    />
+                                }
+                            />
+                        </PageHeader>
+                    </Box>
                 }
             >
                 <SearchHighlightProvider value={getSearchText(searchValue)}>
@@ -598,17 +631,22 @@ export const ProjectFeatureToggles = ({
                         <ConditionallyRender
                             condition={searchValue?.length > 0}
                             show={
-                                <TablePlaceholder>
-                                    No feature toggles found matching &ldquo;
-                                    {searchValue}
-                                    &rdquo;
-                                </TablePlaceholder>
+                                <Box sx={{ padding: theme.spacing(3) }}>
+                                    <TablePlaceholder>
+                                        No feature toggles found matching
+                                        &ldquo;
+                                        {searchValue}
+                                        &rdquo;
+                                    </TablePlaceholder>
+                                </Box>
                             }
                             elseShow={
-                                <TablePlaceholder>
-                                    No feature toggles available. Get started by
-                                    adding a new feature toggle.
-                                </TablePlaceholder>
+                                <Box sx={{ padding: theme.spacing(3) }}>
+                                    <TablePlaceholder>
+                                        No feature toggles available. Get
+                                        started by adding a new feature toggle.
+                                    </TablePlaceholder>
+                                </Box>
                             }
                         />
                     }
diff --git a/src/server-dev.ts b/src/server-dev.ts
index 44b8ff84a9..5755f862a3 100644
--- a/src/server-dev.ts
+++ b/src/server-dev.ts
@@ -47,7 +47,7 @@ process.nextTick(async () => {
                         disableEnvsOnRevive: true,
                         playgroundImprovements: true,
                         featureSearchAPI: true,
-                        featureSearchFrontend: true,
+                        featureSearchFrontend: false,
                     },
                 },
                 authentication: {