diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index 90f6bbebfa5f..64246e3ba65f 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -451,7 +451,7 @@ StylesPreviewWindow_Base::StylesPreviewWindow_Base(
 
 IMPL_LINK(StylesPreviewWindow_Base, Selected, weld::ItemView&, rIconView, void)
 {
-    OUString sStyleName = rIconView.get_selected_text();
+    OUString sStyleName = rIconView.get_selected_id();
 
     css::uno::Sequence<css::beans::PropertyValue> aArgs{
         comphelper::makePropertyValue(u"Template"_ustr, sStyleName),
@@ -654,11 +654,15 @@ void StylesPreviewWindow_Base::UpdateStylesList()
     // for online we can skip inserting the preview into the IconView and rely
     // on DoJsonProperty to provide the image to clients
     const bool bNeedInsertPreview = !comphelper::LibreOfficeKit::isActive();
+    int nIndex = 0;
     for (const auto& rStyle : m_aAllStyles)
     {
         Bitmap aPreview = GetCachedPreview(rStyle);
         Bitmap* pPreview = bNeedInsertPreview ? &aPreview : nullptr;
-        m_xStylesView->append(rStyle.commonName, rStyle.translatedName, pPreview);
+        m_xStylesView->insert(nIndex, nullptr, &rStyle.translatedName, pPreview, nullptr);
+        m_xStylesView->set_item_tooltip_text(nIndex, rStyle.translatedName);
+        m_xStylesView->set_item_accessible_name(nIndex, rStyle.translatedName);
+        nIndex++;
     }
     m_xStylesView->thaw();
 }
diff --git a/svx/uiconfig/ui/stylespreview.ui b/svx/uiconfig/ui/stylespreview.ui
index 001e5bb967ec..894d2493d5a1 100644
--- a/svx/uiconfig/ui/stylespreview.ui
+++ b/svx/uiconfig/ui/stylespreview.ui
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 1.0 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="svx">
+  <!-- interface-name stylespreview.ui -->
   <requires lib="gtk+" version="3.24"/>
   <object class="GtkTreeStore" id="liststore1">
     <columns>
@@ -13,36 +15,37 @@
     </columns>
   </object>
   <object class="GtkBox" id="ApplyStyleBox">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <property name="hexpand">True</property>
     <property name="spacing">6</property>
+    <property name="visible">True</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="spacing">3</property>
+        <property name="visible">True</property>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="width_request">360</property>
-            <property name="height_request">65</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
+            <property name="height-request">65</property>
+            <property name="hscrollbar-policy">never</property>
+            <property name="min-content-width">70</property>
+            <property name="shadow-type">in</property>
             <property name="valign">center</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">always</property>
-            <property name="shadow_type">in</property>
-            <property name="min_content_width">70</property>
+            <property name="visible">True</property>
+            <property name="vscrollbar-policy">always</property>
+            <property name="width-request">360</property>
             <child>
               <object class="GtkIconView" id="stylesview">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="can-focus">True</property>
+                <property name="column-spacing">0</property>
+                <property name="item-padding">0</property>
+                <property name="item-width">70</property>
                 <property name="margin">0</property>
                 <property name="model">liststore1</property>
-                <property name="columns">3</property>
-                <property name="item_width">70</property>
                 <property name="pixbuf-column">0</property>
-                <property name="text-column">1</property>
+                <property name="row-spacing">1</property>
+                <property name="visible">True</property>
               </object>
             </child>
           </object>
diff --git a/sw/qa/uitest/writer_tests4/tdf167956.py b/sw/qa/uitest/writer_tests4/tdf167956.py
index ddf182ddc183..9d0159577059 100644
--- a/sw/qa/uitest/writer_tests4/tdf167956.py
+++ b/sw/qa/uitest/writer_tests4/tdf167956.py
@@ -28,7 +28,7 @@ class tdf167956(UITestCase):
             xStylesView = xWriterDoc.getChild("stylesview")
             self.wait_until_styles_are_displayed(xStylesView)
             self.assertLessEqual("10", get_state_as_dict(xStylesView)["Children"])
-            self.assertEqual("Default Paragraph Style", get_state_as_dict(xStylesView)["SelectEntryText"])
+            self.assertEqual("Default Paragraph Style", get_state_as_dict(xStylesView)["SelectedItemId"])
 
         with self.ui_test.load_file(get_url_for_data_file("tdf167956.docx")):
             xWriterDoc = self.xUITest.getTopFocusWindow()
@@ -37,7 +37,7 @@ class tdf167956(UITestCase):
             # Without the fix in place, this test would have crashed here
             self.wait_until_styles_are_displayed(xStylesView)
             self.assertLessEqual("10", get_state_as_dict(xStylesView)["Children"])
-            self.assertEqual("Intense Quote", get_state_as_dict(xStylesView)["SelectEntryText"])
+            self.assertEqual("Intense Quote", get_state_as_dict(xStylesView)["SelectedItemId"])
 
             # Reset to the default toolbar
             self.xUITest.executeCommand(".uno:ToolbarMode?Mode:string=Default")