diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index 8415763b..68c2b531 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -19,16 +19,16 @@ const Settings = (
 ) => () => (
   <NoMenuLayout>
     <NavPills>
-      <NavPillItem to="app">App</NavPillItem>
+      <NavPillItem to="general">General</NavPillItem>
       <NavPillItem to="short-urls">Short URLs</NavPillItem>
-      <NavPillItem to="others">Others</NavPillItem>
+      <NavPillItem to="secondary-items">Secondary items</NavPillItem>
     </NavPills>
 
     <Routes>
-      <Route path="app" element={<SettingsSections items={[ <UserInterface key="one" />, <RealTimeUpdates key="two" /> ]} />} />
+      <Route path="general" element={<SettingsSections items={[ <UserInterface key="one" />, <RealTimeUpdates key="two" /> ]} />} />
       <Route path="short-urls" element={<SettingsSections items={[ <ShortUrlCreation key="one" />, <ShortUrlsList key="two" /> ]} />} />
-      <Route path="others" element={<SettingsSections items={[ <Tags key="one" />, <Visits key="two" /> ]} />} />
-      <Route path="*" element={<Navigate replace to="app" />} />
+      <Route path="secondary-items" element={<SettingsSections items={[ <Tags key="one" />, <Visits key="two" /> ]} />} />
+      <Route path="*" element={<Navigate replace to="general" />} />
     </Routes>
   </NoMenuLayout>
 );
diff --git a/src/settings/UserInterfaceSettings.tsx b/src/settings/UserInterfaceSettings.tsx
index cca9e11b..5ca2e462 100644
--- a/src/settings/UserInterfaceSettings.tsx
+++ b/src/settings/UserInterfaceSettings.tsx
@@ -1,7 +1,6 @@
 import { FC } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSun, faMoon } from '@fortawesome/free-solid-svg-icons';
-import { FormGroup } from 'reactstrap';
 import { SimpleCard } from '../utils/SimpleCard';
 import ToggleSwitch from '../utils/ToggleSwitch';
 import { changeThemeInMarkup, Theme } from '../utils/theme';
@@ -15,19 +14,17 @@ interface UserInterfaceProps {
 
 export const UserInterfaceSettings: FC<UserInterfaceProps> = ({ settings: { ui }, setUiSettings }) => (
   <SimpleCard title="User interface" className="h-100">
-    <FormGroup>
-      <FontAwesomeIcon icon={ui?.theme === 'dark' ? faMoon : faSun} className="user-interface__theme-icon" />
-      <ToggleSwitch
-        checked={ui?.theme === 'dark'}
-        onChange={(useDarkTheme) => {
-          const theme: Theme = useDarkTheme ? 'dark' : 'light';
+    <FontAwesomeIcon icon={ui?.theme === 'dark' ? faMoon : faSun} className="user-interface__theme-icon" />
+    <ToggleSwitch
+      checked={ui?.theme === 'dark'}
+      onChange={(useDarkTheme) => {
+        const theme: Theme = useDarkTheme ? 'dark' : 'light';
 
-          setUiSettings({ ...ui, theme });
-          changeThemeInMarkup(theme);
-        }}
-      >
-        Use dark theme.
-      </ToggleSwitch>
-    </FormGroup>
+        setUiSettings({ ...ui, theme });
+        changeThemeInMarkup(theme);
+      }}
+    >
+      Use dark theme.
+    </ToggleSwitch>
   </SimpleCard>
 );
diff --git a/src/utils/NavPills.tsx b/src/utils/NavPills.tsx
index e00000c7..3d7c3e8e 100644
--- a/src/utils/NavPills.tsx
+++ b/src/utils/NavPills.tsx
@@ -14,9 +14,9 @@ export const NavPillItem: FC<NavPillProps> = ({ children, ...rest }) => (
   </NavLink>
 );
 
-export const NavPills: FC = ({ children }) => (
+export const NavPills: FC<{ fill?: boolean }> = ({ children, fill = false }) => (
   <Card className="nav-pills__nav p-0 overflow-hidden mb-3" body>
-    <Nav pills fill>
+    <Nav pills fill={fill}>
       {Children.map(children, (child) => {
         if (!isValidElement(child) || child.type !== NavPillItem) {
           throw new Error('Only NavPillItem children are allowed inside NavPills.');
diff --git a/src/visits/VisitsStats.tsx b/src/visits/VisitsStats.tsx
index 9c740a5d..b9701765 100644
--- a/src/visits/VisitsStats.tsx
+++ b/src/visits/VisitsStats.tsx
@@ -143,7 +143,7 @@ const VisitsStats: FC<VisitsStatsProps> = ({
 
     return (
       <>
-        <NavPills>
+        <NavPills fill>
           {Object.values(sections).map(({ title, icon, subPath }, index) => (
             <NavPillItem key={index} to={buildSectionUrl(subPath)} replace>
               <FontAwesomeIcon icon={icon} />
diff --git a/test/settings/Settings.test.tsx b/test/settings/Settings.test.tsx
index e71083e6..c39b104b 100644
--- a/test/settings/Settings.test.tsx
+++ b/test/settings/Settings.test.tsx
@@ -22,8 +22,8 @@ describe('<Settings />', () => {
     const items = wrapper.find(NavPillItem);
 
     expect(items).toHaveLength(3);
-    expect(items.first().prop('to')).toEqual('app');
+    expect(items.first().prop('to')).toEqual('general');
     expect(items.at(1).prop('to')).toEqual('short-urls');
-    expect(items.last().prop('to')).toEqual('others');
+    expect(items.last().prop('to')).toEqual('secondary-items');
   });
 });
diff --git a/test/utils/NavPills.test.tsx b/test/utils/NavPills.test.tsx
index ed21aeb8..5f015432 100644
--- a/test/utils/NavPills.test.tsx
+++ b/test/utils/NavPills.test.tsx
@@ -17,9 +17,13 @@ describe('<NavPills />', () => {
     }
   });
 
-  it('renders provided items', () => {
+  it.each([
+    [ undefined ],
+    [ true ],
+    [ false ],
+  ])('renders provided items', (fill) => {
     const wrapper = shallow(
-      <NavPills>
+      <NavPills fill={fill}>
         <NavPillItem to="1">1</NavPillItem>
         <NavPillItem to="2">2</NavPillItem>
         <NavPillItem to="3">3</NavPillItem>
@@ -32,6 +36,6 @@ describe('<NavPills />', () => {
     expect(card.prop('body')).toEqual(true);
     expect(nav).toHaveLength(1);
     expect(nav.prop('pills')).toEqual(true);
-    expect(nav.prop('fill')).toEqual(true);
+    expect(nav.prop('fill')).toEqual(!!fill);
   });
 });