diff --git a/client/src/components/Apps/AppTable/AppTable.tsx b/client/src/components/Apps/AppTable/AppTable.tsx
index 003e1a73ab163888eaf3e38d611a5320a8f78cfc..8279c7727e10948c5b249455c3cdddec4cfded69 100644
--- a/client/src/components/Apps/AppTable/AppTable.tsx
+++ b/client/src/components/Apps/AppTable/AppTable.tsx
@@ -94,7 +94,7 @@ export const AppTable = (props: Props): JSX.Element => {
         ) : (
           <p>
             Custom order is disabled. You can change it in the{' '}
-            <Link to="/settings/interface">settings</Link>
+            <Link to="/settings/general">settings</Link>
           </p>
         )}
       </Message>
diff --git a/client/src/components/Bookmarks/Table/CategoryTable.tsx b/client/src/components/Bookmarks/Table/CategoryTable.tsx
index d909caba25700a8d5589d1e622c9880ba86a1b1a..5a88097b0239566431b607a37e002aa6b58384c6 100644
--- a/client/src/components/Bookmarks/Table/CategoryTable.tsx
+++ b/client/src/components/Bookmarks/Table/CategoryTable.tsx
@@ -102,7 +102,7 @@ export const CategoryTable = ({ openFormForUpdating }: Props): JSX.Element => {
         ) : (
           <p>
             Custom order is disabled. You can change it in the{' '}
-            <Link to="/settings/interface">settings</Link>
+            <Link to="/settings/general">settings</Link>
           </p>
         )}
       </Message>
diff --git a/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx b/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx
index 8c2e5fd3fc5ba4f53bb8e3299ee932c85afce904..4173c729a3135c66623aa8af909437ff1e51f554 100644
--- a/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx
+++ b/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx
@@ -23,12 +23,14 @@ import { bindActionCreators } from 'redux';
 import { actionCreators } from '../../../store';
 
 export const GeneralSettings = (): JSX.Element => {
-  const { loading, customQueries, config } = useSelector(
-    (state: State) => state.config
-  );
+  const {
+    config: { loading, customQueries, config },
+    bookmarks: { categories },
+  } = useSelector((state: State) => state);
 
   const dispatch = useDispatch();
-  const { updateConfig } = bindActionCreators(actionCreators, dispatch);
+  const { updateConfig, sortApps, sortCategories, sortBookmarks } =
+    bindActionCreators(actionCreators, dispatch);
 
   // Initial state
   const [formData, setFormData] = useState<GeneralForm>(
@@ -48,6 +50,16 @@ export const GeneralSettings = (): JSX.Element => {
 
     // Save settings
     await updateConfig(formData);
+
+    // Sort entities with new settings
+    if (formData.useOrdering !== config.useOrdering) {
+      sortApps();
+      sortCategories();
+
+      for (let { id } of categories) {
+        sortBookmarks(id);
+      }
+    }
   };
 
   // Input handler
@@ -65,40 +77,70 @@ export const GeneralSettings = (): JSX.Element => {
 
   return (
     <Fragment>
-      {/* GENERAL SETTINGS */}
       <form
         onSubmit={(e) => formSubmitHandler(e)}
         style={{ marginBottom: '30px' }}
       >
+        {/* === GENERAL OPTIONS === */}
         <SettingsHeadline text="General" />
+        {/* SORT TYPE */}
         <InputGroup>
-          <label htmlFor="defaultSearchProvider">Default search provider</label>
+          <label htmlFor="useOrdering">Sorting type</label>
           <select
-            id="defaultSearchProvider"
-            name="defaultSearchProvider"
-            value={formData.defaultSearchProvider}
+            id="useOrdering"
+            name="useOrdering"
+            value={formData.useOrdering}
             onChange={(e) => inputChangeHandler(e)}
           >
-            {[...queries, ...customQueries].map((query: Query, idx) => {
-              const isCustom = idx >= queries.length;
+            <option value="createdAt">By creation date</option>
+            <option value="name">Alphabetical order</option>
+            <option value="orderId">Custom order</option>
+          </select>
+        </InputGroup>
 
-              return (
-                <option key={idx} value={query.prefix}>
-                  {isCustom && '+'} {query.name}
-                </option>
-              );
-            })}
+        {/* === APPS OPTIONS === */}
+        <SettingsHeadline text="Apps" />
+        {/* PIN APPS */}
+        <InputGroup>
+          <label htmlFor="pinAppsByDefault">
+            Pin new applications by default
+          </label>
+          <select
+            id="pinAppsByDefault"
+            name="pinAppsByDefault"
+            value={formData.pinAppsByDefault ? 1 : 0}
+            onChange={(e) => inputChangeHandler(e, { isBool: true })}
+          >
+            <option value={1}>True</option>
+            <option value={0}>False</option>
           </select>
         </InputGroup>
 
+        {/* APPS OPPENING */}
         <InputGroup>
-          <label htmlFor="searchSameTab">
-            Open search results in the same tab
+          <label htmlFor="appsSameTab">Open applications in the same tab</label>
+          <select
+            id="appsSameTab"
+            name="appsSameTab"
+            value={formData.appsSameTab ? 1 : 0}
+            onChange={(e) => inputChangeHandler(e, { isBool: true })}
+          >
+            <option value={1}>True</option>
+            <option value={0}>False</option>
+          </select>
+        </InputGroup>
+
+        {/* === BOOKMARKS OPTIONS === */}
+        <SettingsHeadline text="Bookmarks" />
+        {/* PIN CATEGORIES */}
+        <InputGroup>
+          <label htmlFor="pinCategoriesByDefault">
+            Pin new categories by default
           </label>
           <select
-            id="searchSameTab"
-            name="searchSameTab"
-            value={formData.searchSameTab ? 1 : 0}
+            id="pinCategoriesByDefault"
+            name="pinCategoriesByDefault"
+            value={formData.pinCategoriesByDefault ? 1 : 0}
             onChange={(e) => inputChangeHandler(e, { isBool: true })}
           >
             <option value={1}>True</option>
@@ -106,12 +148,15 @@ export const GeneralSettings = (): JSX.Element => {
           </select>
         </InputGroup>
 
+        {/* BOOKMARKS OPPENING */}
         <InputGroup>
-          <label htmlFor="hideSearch">Hide search bar</label>
+          <label htmlFor="bookmarksSameTab">
+            Open bookmarks in the same tab
+          </label>
           <select
-            id="hideSearch"
-            name="hideSearch"
-            value={formData.hideSearch ? 1 : 0}
+            id="bookmarksSameTab"
+            name="bookmarksSameTab"
+            value={formData.bookmarksSameTab ? 1 : 0}
             onChange={(e) => inputChangeHandler(e, { isBool: true })}
           >
             <option value={1}>True</option>
@@ -119,12 +164,36 @@ export const GeneralSettings = (): JSX.Element => {
           </select>
         </InputGroup>
 
+        {/* SEARCH SETTINGS */}
+        <SettingsHeadline text="Search" />
+        <InputGroup>
+          <label htmlFor="defaultSearchProvider">Default search provider</label>
+          <select
+            id="defaultSearchProvider"
+            name="defaultSearchProvider"
+            value={formData.defaultSearchProvider}
+            onChange={(e) => inputChangeHandler(e)}
+          >
+            {[...queries, ...customQueries].map((query: Query, idx) => {
+              const isCustom = idx >= queries.length;
+
+              return (
+                <option key={idx} value={query.prefix}>
+                  {isCustom && '+'} {query.name}
+                </option>
+              );
+            })}
+          </select>
+        </InputGroup>
+
         <InputGroup>
-          <label htmlFor="disableAutofocus">Disable search bar autofocus</label>
+          <label htmlFor="searchSameTab">
+            Open search results in the same tab
+          </label>
           <select
-            id="disableAutofocus"
-            name="disableAutofocus"
-            value={formData.disableAutofocus ? 1 : 0}
+            id="searchSameTab"
+            name="searchSameTab"
+            value={formData.searchSameTab ? 1 : 0}
             onChange={(e) => inputChangeHandler(e, { isBool: true })}
           >
             <option value={1}>True</option>