diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 6d63dc74a2a2..1731e95cee95 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -162,9 +162,9 @@ private:
     // Handler
     DECL_LINK(SelStyleHdl_Impl, SvtLineListBox&, void);
     DECL_LINK(SelColHdl_Impl, ColorListBox&, void);
-    DECL_LINK(SelPreHdl_Impl, weld::IconView&, void);
+    DECL_LINK(SelPreHdl_Impl, weld::ItemView&, void);
     DECL_LINK(FocusOutPresets_Impl, weld::Widget&, void);
-    DECL_LINK(SelSdwHdl_Impl, weld::IconView&, void);
+    DECL_LINK(SelSdwHdl_Impl, weld::ItemView&, void);
     DECL_LINK(LinesChanged_Impl, LinkParamNone*, void);
     DECL_LINK(ModifyDistanceHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(ModifyWidthLBHdl_Impl, weld::ComboBox&, void);
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 214e62b61b09..6ec63376f718 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1156,7 +1156,7 @@ void SvxBorderTabPage::HideShadowControls()
 #define IID_PRE_TABLE_ALL       20
 #define IID_PRE_TABLE_OUTER2    21
 
-IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, weld::IconView&, void)
+IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, weld::ItemView&, void)
 {
     const svx::FrameBorderState SHOW = svx::FrameBorderState::Show;
     const svx::FrameBorderState HIDE = svx::FrameBorderState::Hide;
@@ -1231,7 +1231,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, FocusOutPresets_Impl, weld::Widget&, void)
     m_xWndPresets->unselect_all();
 }
 
-IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl, weld::IconView&, void)
+IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl, weld::ItemView&, void)
 {
     OUString sSelectedId = m_xWndShadows->get_selected_id();
     bool bEnable = !sSelectedId.isEmpty() && sSelectedId.toInt32() > 1;
diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx
index 496fbb8d3f31..e4e82b97392b 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -364,7 +364,7 @@ public:
 
 protected:
     DECL_LINK(ChangedHdl, weld::ItemView&, void);
-    DECL_LINK(SelectionChangedHdl, weld::IconView&, void);
+    DECL_LINK(SelectionChangedHdl, weld::ItemView&, void);
     DECL_LINK(RowActivatedHdl, const weld::TreeIter&, bool);
     DECL_LINK(ItemActivatedHdl, const weld::TreeIter&, bool);
 
@@ -1323,7 +1323,7 @@ IMPL_LINK_NOARG(SvtFileView_Impl, ChangedHdl, weld::ItemView&, void)
         m_aSelectHandler.Call(m_pAntiImpl);
 }
 
-IMPL_LINK_NOARG(SvtFileView_Impl, SelectionChangedHdl, weld::IconView&, void)
+IMPL_LINK_NOARG(SvtFileView_Impl, SelectionChangedHdl, weld::ItemView&, void)
 {
     if (!mnSuspendSelectCallback)
         m_aSelectHandler.Call(m_pAntiImpl);
diff --git a/include/sfx2/charmapcontainer.hxx b/include/sfx2/charmapcontainer.hxx
index d40fd6a893fa..23a831bad2fa 100644
--- a/include/sfx2/charmapcontainer.hxx
+++ b/include/sfx2/charmapcontainer.hxx
@@ -62,7 +62,7 @@ class SFX2_DLLPUBLIC SfxCharmapContainer
     Link<void*, void> m_aUpdateFavHdl;
     Link<void*, void> m_aUpdateRecentHdl;
 
-    DECL_DLLPRIVATE_LINK(IconViewSelectionChangedHdl, weld::IconView&, void);
+    DECL_DLLPRIVATE_LINK(IconViewSelectionChangedHdl, weld::ItemView&, void);
     DECL_DLLPRIVATE_LINK(RecentItemActivatedHdl, const weld::TreeIter&, bool);
     DECL_DLLPRIVATE_LINK(FavItemActivatedHdl, const weld::TreeIter&, bool);
     DECL_DLLPRIVATE_LINK(ItemViewFocusInHdl, weld::Widget&, void);
diff --git a/include/svx/ThemeColorsToolBoxControl.hxx b/include/svx/ThemeColorsToolBoxControl.hxx
index 1830c5742cbb..0a6c2fc29cab 100644
--- a/include/svx/ThemeColorsToolBoxControl.hxx
+++ b/include/svx/ThemeColorsToolBoxControl.hxx
@@ -33,7 +33,7 @@ public:
     void SetOptimalSize();
     void refreshThemeColors();
 
-    DECL_LINK(SelectionChangedHdl, weld::IconView&, void);
+    DECL_LINK(SelectionChangedHdl, weld::ItemView&, void);
 
 protected:
     void onColorSetActivated() override;
diff --git a/include/svx/dialog/ThemeColorsPaneBase.hxx b/include/svx/dialog/ThemeColorsPaneBase.hxx
index 3b38f9fb436f..869cb1558493 100644
--- a/include/svx/dialog/ThemeColorsPaneBase.hxx
+++ b/include/svx/dialog/ThemeColorsPaneBase.hxx
@@ -40,7 +40,7 @@ public:
     explicit ThemeColorsPaneBase(std::unique_ptr<weld::IconView> xIconView);
     virtual ~ThemeColorsPaneBase();
 
-    DECL_LINK(SelectionChangedHdl, weld::IconView&, void);
+    DECL_LINK(SelectionChangedHdl, weld::ItemView&, void);
     DECL_LINK(ItemActivatedHdl, const weld::TreeIter&, bool);
 
     std::shared_ptr<model::ColorSet> const& getCurrentColorSet() { return mpCurrentColorSet; }
diff --git a/include/vcl/weld/IconView.hxx b/include/vcl/weld/IconView.hxx
index 270593923e76..7dc6fae62c19 100644
--- a/include/vcl/weld/IconView.hxx
+++ b/include/vcl/weld/IconView.hxx
@@ -21,7 +21,7 @@ class VCL_DLLPUBLIC IconView : virtual public ItemView
     friend class ::LOKTrigger;
 
 protected:
-    Link<IconView&, void> m_aSelectionChangeHdl;
+    Link<ItemView&, void> m_aSelectionChangeHdl;
     Link<const TreeIter&, OUString> m_aQueryTooltipHdl;
     Link<const encoded_image_query&, bool> m_aGetPropertyTreeElemHdl;
 
@@ -81,7 +81,7 @@ public:
 
     void append_separator(const OUString& rId) { insert_separator(-1, &rId); }
 
-    void connect_selection_changed(const Link<IconView&, void>& rLink)
+    void connect_selection_changed(const Link<ItemView&, void>& rLink)
     {
         m_aSelectionChangeHdl = rLink;
     }
diff --git a/sfx2/source/control/charmapcontainer.cxx b/sfx2/source/control/charmapcontainer.cxx
index 7d057415f1a3..82e40337121b 100644
--- a/sfx2/source/control/charmapcontainer.cxx
+++ b/sfx2/source/control/charmapcontainer.cxx
@@ -364,7 +364,7 @@ void SfxCharmapContainer::updateCharControl(weld::IconView& rIconView,
     }
 }
 
-IMPL_LINK(SfxCharmapContainer, IconViewSelectionChangedHdl, weld::IconView&, rIconView, void)
+IMPL_LINK(SfxCharmapContainer, IconViewSelectionChangedHdl, weld::ItemView&, rIconView, void)
 {
     std::unique_ptr<weld::TreeIter> pIter = rIconView.get_selected();
     if (!pIter)
diff --git a/svx/source/dialog/ThemeColorsPaneBase.cxx b/svx/source/dialog/ThemeColorsPaneBase.cxx
index 7c984e3bcb6e..90a49b42d732 100644
--- a/svx/source/dialog/ThemeColorsPaneBase.cxx
+++ b/svx/source/dialog/ThemeColorsPaneBase.cxx
@@ -104,7 +104,7 @@ VclPtr<VirtualDevice> ThemeColorsPaneBase::CreateColorSetPreview(const model::Co
     return pVDev;
 }
 
-IMPL_LINK_NOARG(ThemeColorsPaneBase, SelectionChangedHdl, weld::IconView&, void)
+IMPL_LINK_NOARG(ThemeColorsPaneBase, SelectionChangedHdl, weld::ItemView&, void)
 {
     if (!mxIconViewThemeColors)
         return;
diff --git a/svx/source/inc/StylesPreviewWindow.hxx b/svx/source/inc/StylesPreviewWindow.hxx
index 48cd159ac373..e568ae972e78 100644
--- a/svx/source/inc/StylesPreviewWindow.hxx
+++ b/svx/source/inc/StylesPreviewWindow.hxx
@@ -119,7 +119,7 @@ protected:
 
     OUString m_sSelectedStyle;
 
-    DECL_LINK(Selected, weld::IconView&, void);
+    DECL_LINK(Selected, weld::ItemView&, void);
     DECL_LINK(DoubleClick, const weld::TreeIter&, bool);
     DECL_LINK(DoCommand, const CommandEvent&, bool);
     DECL_LINK(GetPreviewImage, const weld::encoded_image_query&, bool);
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index 84b28a861478..90f6bbebfa5f 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -449,7 +449,7 @@ StylesPreviewWindow_Base::StylesPreviewWindow_Base(
     RequestStylesListUpdate();
 }
 
-IMPL_LINK(StylesPreviewWindow_Base, Selected, weld::IconView&, rIconView, void)
+IMPL_LINK(StylesPreviewWindow_Base, Selected, weld::ItemView&, rIconView, void)
 {
     OUString sStyleName = rIconView.get_selected_text();
 
diff --git a/svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx b/svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx
index bc2eb709176f..c6d406fecc13 100644
--- a/svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx
+++ b/svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx
@@ -132,7 +132,7 @@ void ThemeColorsPaneWrapper::onColorSetActivated()
     comphelper::dispatchCommand(u".uno:ApplyTheme"_ustr, m_xFrame, aArgs);
 }
 
-IMPL_LINK_NOARG(ThemeColorsPaneWrapper, SelectionChangedHdl, weld::IconView&, void)
+IMPL_LINK_NOARG(ThemeColorsPaneWrapper, SelectionChangedHdl, weld::ItemView&, void)
 {
     // Call base class selection handler first to update mpCurrentColorSet
     svx::ThemeColorsPaneBase::SelectionChangedHdl(*mxIconViewThemeColors);
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 28d577069e90..3f1bdb2a83ee 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1266,7 +1266,7 @@ DeactivateRC SwColumnPage::DeactivatePage(SfxItemSet *_pSet)
     return DeactivateRC::LeavePage;
 }
 
-IMPL_LINK_NOARG(SwColumnPage, SetDefaultsHdl, weld::IconView&, void)
+IMPL_LINK_NOARG(SwColumnPage, SetDefaultsHdl, weld::ItemView&, void)
 {
     std::unique_ptr<weld::TreeIter> pSelected = m_xDefaultIconView->get_selected();
     if (!pSelected)
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 26deb8e91864..4ca4a87fb858 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -24,6 +24,7 @@
 #include <svx/colorbox.hxx>
 #include <svx/frmdirlbox.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/ItemView.hxx>
 #include <vcl/weld/MetricSpinButton.hxx>
 #include <vcl/weld/SpinButton.hxx>
 #include <map>
@@ -127,7 +128,7 @@ class SwColumnPage final : public SfxTabPage
     DECL_LINK(GapModify, weld::MetricSpinButton&, void);
     DECL_LINK(EdModify, weld::MetricSpinButton&, void);
     DECL_LINK(AutoWidthHdl, weld::Toggleable&, void );
-    DECL_LINK(SetDefaultsHdl, weld::IconView&, void);
+    DECL_LINK(SetDefaultsHdl, weld::ItemView&, void);
 
     DECL_LINK(Up, weld::Button&, void);
     DECL_LINK(Down, weld::Button&, void);