diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/map/index.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/map/index.js
index 2f241e1d7..7c154662a 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/map/index.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/map/index.js
@@ -28,7 +28,7 @@ export const OhMapPageDefinition = () => new WidgetDefinition('oh-map-page', 'Ma
 export const OhMapMarkerDefinition = () => new WidgetDefinition('oh-map-marker', 'Map Marker', 'An icon on a map', 'map_pin')
   .paramGroup(pg('marker', 'Marker', 'General marker settings'), [
     LabelParam(),
-    pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/docs/configuration/iconsets/classic/">openHAB icon</a>)')
+    pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>)')
   ])
   .paramGroup(pg('position', 'Position', 'Position'), [
     ItemParam(),
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/plan/index.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/plan/index.js
index 08dcd37f0..faac92492 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/plan/index.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/plan/index.js
@@ -27,7 +27,7 @@ export const OhPlanMarkerDefinition = () => new WidgetDefinition('oh-plan-marker
     pi('item', 'Item', 'The item whose state to display on this marker')
   ])
   .paramGroup(pg('icon', 'Icon'), [
-    pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/docs/configuration/iconsets/classic/">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)'),
+    pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)'),
     pb('iconUseState', 'Icon depends on state', 'Use the state of the item to get a dynamic icon (for openHAB icons only)'),
     pn('iconSize', 'Icon Size', 'Size of the icon in pixels (40 by default)'),
     pt('iconColor', 'Icon Color', 'Color of the icon (for Framework7/Material icons); use expression for dynamic colors')
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/cards.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/cards.js
index 9f7d6a36b..821462814 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/cards.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/cards.js
@@ -24,7 +24,7 @@ export const OhLabelCardDefinition = () => new WidgetDefinition('oh-label-card',
     pt('background', 'Background style', 'Background style (in CSS "background" attribute format)'),
     pt('fontSize', 'Font Size', 'Font size (e.g. "34px")'),
     pt('fontWeight', 'Font Weight', 'Font weight (e.g. "normal" or "bold")'),
-    pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/docs/configuration/iconsets/classic/">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)'),
+    pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)'),
     pt('iconColor', 'Icon Color', 'Not applicable to openHAB icons').a(),
     pn('iconSize', 'Icon Size', 'Size of the icon in px').a(),
     pb('iconUseState', 'Icon depends on state', 'Use the state of the item to get a dynamic icon (for openHAB icons only)').a(),
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/cells.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/cells.js
index a3f8eb752..0815af6f6 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/cells.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/cells.js
@@ -11,7 +11,7 @@ export const CellParameters = () => [
   pt('title', 'Title', 'Title of the cell'),
   pt('subtitle', 'Subtitle', 'Subtitle of the cell'),
   pt('footer', 'Footer', 'Footer of the cell'),
-  pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/docs/configuration/iconsets/classic/">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)'),
+  pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)'),
   pt('color', 'Highlight Color', 'Color to use when highlighted'),
   pt('on', '"On" expression', 'Expression to determine when the card should be highlighted. If blank, determine automatically from the primary bound item if applicable.').a()
 ]
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/listitems.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/listitems.js
index 93f3ad40c..a87905d65 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/listitems.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/standard/listitems.js
@@ -9,7 +9,7 @@ export const ListItemParameters = () => [
   pt('title', 'Title', 'Title of the item'),
   pt('subtitle', 'Subtitle', 'Subtitle of the item'),
   pt('after', 'After', 'Text to display on the opposite side of the item (set either this or a badge)').a(),
-  pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/docs/configuration/iconsets/classic/">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)'),
+  pt('icon', 'Icon', 'Use <code>oh:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>) or <code>f7:iconName</code> (<a class="external text-color-blue" target="_blank" href="https://framework7.io/icons/">Framework7 icon</a>)'),
   pt('iconColor', 'Icon Color', 'Not applicable to openHAB icons').a(),
   pb('iconUseState', 'Icon depends on state', 'Use the state of the item to get a dynamic icon (for openHAB icons only)').a()
 ]
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/icon.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/icon.js
index f5dfcefc1..101f393c9 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/icon.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/icon.js
@@ -1,7 +1,7 @@
 import { pb, pt } from '../helpers'
 
 export default () => [
-  pb('icon', 'Icon', '<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/docs/configuration/iconsets/classic/">openHAB icon</a>'),
+  pb('icon', 'Icon', '<a class="external text-color-blue" target="_blank" href="https://www.openhab.org/link/icons">openHAB icon</a>'),
   pt('width', 'Width', ''),
   pt('inputmode', 'Input Mode', 'Type of data that might be entered: see <a class="external text-color-blue" target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/inputmode">MDN docs</a>'),
   pt('placeholder', 'Placeholder', 'Placeholder text'),
diff --git a/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-alexa.vue b/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-alexa.vue
index 47062bf4b..939e139e6 100644
--- a/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-alexa.vue
+++ b/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-alexa.vue
@@ -29,7 +29,7 @@
       <config-sheet :parameterGroups="[]" :parameters="parameters" :configuration="metadata.config" />
     </div>
     <p class="padding">
-      <f7-link color="blue" external target="_blank" href="https://www.openhab.org/docs/ecosystem/alexa/">Alexa Integration Documentation</f7-link>
+      <f7-link color="blue" external target="_blank" href="https://www.openhab.org/link/alexa">Alexa Integration Documentation</f7-link>
     </p>
   </div>
 </template>
diff --git a/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-ga.vue b/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-ga.vue
index ad290cf15..2b3d8ee20 100644
--- a/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-ga.vue
+++ b/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-ga.vue
@@ -13,7 +13,7 @@
       <config-sheet :parameterGroups="[]" :parameters="parameters" :configuration="metadata.config" />
     </div>
     <p class="padding">
-      <f7-link color="blue" external target="_blank" href="https://www.openhab.org/docs/ecosystem/google-assistant/">Google Assistant Integration Documentation</f7-link>
+      <f7-link color="blue" external target="_blank" href="https://www.openhab.org/link/google-assistant">Google Assistant Integration Documentation</f7-link>
     </p>
   </div>
 </template>
diff --git a/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-homekit.vue b/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-homekit.vue
index 5e2bab018..2d3bb9fe3 100644
--- a/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-homekit.vue
+++ b/bundles/org.openhab.ui/web/src/components/item/metadata/item-metadata-homekit.vue
@@ -20,7 +20,7 @@
       <config-sheet :parameterGroups="[]" :parameters="parameters" :configuration="metadata.config" />
     </div>
     <p class="padding">
-      <f7-link color="blue" external target="_blank" href="https://www.openhab.org/addons/integrations/homekit/">HomeKit integration documentation</f7-link>
+      <f7-link color="blue" external target="_blank" href="https://www.openhab.org/link/homekit">HomeKit integration documentation</f7-link>
     </p>
   </div>
 </template>
diff --git a/bundles/org.openhab.ui/web/src/pages/home/overview-tab.vue b/bundles/org.openhab.ui/web/src/pages/home/overview-tab.vue
index bbd016aaa..813706f28 100644
--- a/bundles/org.openhab.ui/web/src/pages/home/overview-tab.vue
+++ b/bundles/org.openhab.ui/web/src/pages/home/overview-tab.vue
@@ -19,9 +19,9 @@
   <div class="empty-overview" v-else-if="!inChatSession">
     <empty-state-placeholder icon="house" title="overview.title" text="overview.text" />
     <f7-row class="display-flex justify-content-center">
-      <f7-button large fill color="blue" external href="https://next.openhab.org/docs/" target="_blank" v-t="'home.overview.button.documentation'"></f7-button>
+      <f7-button large fill color="blue" external href="https://openhab.org/link/docs" target="_blank" v-t="'home.overview.button.documentation'"></f7-button>
       <span style="width: 8px"></span>
-      <f7-button large color="blue" external href="https://next.openhab.org/docs/tutorial/" target="_blank" v-t="'home.overview.button.tutorial'"></f7-button>
+      <f7-button large color="blue" external href="https://openhab.org/link/tutorial" target="_blank" v-t="'home.overview.button.tutorial'"></f7-button>
     </f7-row>
   </div>
 </div>
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/link/link-add.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/link/link-add.vue
index 389bdffd8..5cb0d9dae 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/things/link/link-add.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/things/link/link-add.vue
@@ -78,7 +78,7 @@
         <f7-block-title>Profile</f7-block-title>
         <f7-block-footer class="padding-left padding-right">
           Profiles define how Channels and Items work together. Install transformation add-ons to get additional profiles.
-          <f7-link external color="blue" target="_blank" href="https://www.openhab.org/docs/configuration/items.html#profiles">Learn more about profiles.</f7-link>
+          <f7-link external color="blue" target="_blank" href="https://www.openhab.org/link/profiles">Learn more about profiles.</f7-link>
         </f7-block-footer>
         <f7-list>
           <f7-list-item radio :checked="!currentProfileType" value="" @change="onProfileTypeChange()" title="(No Profile)" name="profile-type" />
diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/link/link-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/link/link-edit.vue
index 563b836e1..3ee18b21c 100644
--- a/bundles/org.openhab.ui/web/src/pages/settings/things/link/link-edit.vue
+++ b/bundles/org.openhab.ui/web/src/pages/settings/things/link/link-edit.vue
@@ -41,7 +41,7 @@
         <f7-block-title>Profile</f7-block-title>
         <f7-block-footer class="padding-left padding-right">
           Profiles define how Channels and Items work together. Install transformation add-ons to get additional profiles.
-          <f7-link external color="blue" target="_blank" href="https://www.openhab.org/docs/configuration/items.html#profiles">Learn more about profiles.</f7-link>
+          <f7-link external color="blue" target="_blank" href="https://www.openhab.org/link/profiles">Learn more about profiles.</f7-link>
         <f7-block v-if="!ready" class="text-align-center">
           <f7-preloader></f7-preloader>
           <div>Loading...</div>