diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 6addfed914d4..7ff9fbf4d097 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -101,7 +101,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Light source 1</property>
                             <property name="tooltip_text" translatable="yes">Light source 1</property>
                             <property name="image">IMG_LIGHT_1</property>
                           </object>
@@ -118,7 +117,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Light source 2</property>
                             <property name="tooltip_text" translatable="yes">Light source 2</property>
                             <property name="image">IMG_LIGHT_2</property>
                           </object>
@@ -135,7 +133,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Light source 3</property>
                             <property name="tooltip_text" translatable="yes">Light source 3</property>
                             <property name="image">IMG_LIGHT_3</property>
                           </object>
@@ -152,7 +149,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Light source 4</property>
                             <property name="tooltip_text" translatable="yes">Light source 4</property>
                             <property name="image">IMG_LIGHT_4</property>
                           </object>
@@ -169,7 +165,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Light source 5</property>
                             <property name="tooltip_text" translatable="yes">Light source 5</property>
                             <property name="image">IMG_LIGHT_5</property>
                           </object>
@@ -186,7 +181,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Light source 6</property>
                             <property name="tooltip_text" translatable="yes">Light source 6</property>
                             <property name="image">IMG_LIGHT_6</property>
                           </object>
@@ -203,7 +197,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Light source 7</property>
                             <property name="tooltip_text" translatable="yes">Light source 7</property>
                             <property name="image">IMG_LIGHT_7</property>
                           </object>
@@ -220,7 +213,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Light source 8</property>
                             <property name="tooltip_text" translatable="yes">Light source 8</property>
                             <property name="image">IMG_LIGHT_8</property>
                           </object>
@@ -260,7 +252,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Select a color using the color dialog</property>
                             <property name="tooltip_text" translatable="yes">Select a color using the color dialog</property>
                             <property name="image">IMG_LIGHTSOURCE_COLOR</property>
                           </object>
@@ -335,7 +326,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select a color using the color dialog</property>
                         <property name="tooltip_text" translatable="yes">Select a color using the color dialog</property>
                         <property name="image">IMG_AMBIENT_COLOR</property>
                       </object>
diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui b/chart2/uiconfig/ui/tp_RangeChooser.ui
index bd997ec8d72d..ac472b67a8a5 100644
--- a/chart2/uiconfig/ui/tp_RangeChooser.ui
+++ b/chart2/uiconfig/ui/tp_RangeChooser.ui
@@ -5,7 +5,7 @@
   <object class="GtkImage" id="imageIB_RANGE">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="tooltip_markup" translatable="yes">Select data range</property>
+    <property name="tooltip_text" translatable="yes">Select data range</property>
     <property name="pixbuf">chart2/res/selectrange.png</property>
   </object>
   <object class="GtkBox" id="tp_RangeChooser">
@@ -76,7 +76,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="receives_default">True</property>
-                <property name="tooltip_markup" translatable="yes">Select data range</property>
+                <property name="tooltip_text" translatable="yes">Select data range</property>
                 <property name="image">imageIB_RANGE</property>
               </object>
               <packing>
diff --git a/cui/uiconfig/ui/lineendstabpage.ui b/cui/uiconfig/ui/lineendstabpage.ui
index 6a3106f5c4c2..00bcec8e924f 100644
--- a/cui/uiconfig/ui/lineendstabpage.ui
+++ b/cui/uiconfig/ui/lineendstabpage.ui
@@ -187,7 +187,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Load arrow styles</property>
                             <property name="tooltip_text" translatable="yes">Load arrow styles</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
@@ -206,7 +205,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Save arrow styles</property>
                             <property name="tooltip_text" translatable="yes">Save arrow styles</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/linestyletabpage.ui b/cui/uiconfig/ui/linestyletabpage.ui
index d8d1c3b59c0f..ee3e2b5029b3 100644
--- a/cui/uiconfig/ui/linestyletabpage.ui
+++ b/cui/uiconfig/ui/linestyletabpage.ui
@@ -389,7 +389,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Load Line Styles</property>
                             <property name="tooltip_text" translatable="yes">Load Line Styles</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
@@ -408,7 +407,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Save Line Styles</property>
                             <property name="tooltip_text" translatable="yes">Save Line Styles</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index 9308246eb3f0..a6250aa4141a 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -123,7 +123,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Add</property>
                     <property name="tooltip_text" translatable="yes">Add</property>
                     <property name="valign">center</property>
                     <property name="image">image2</property>
@@ -139,7 +138,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Edit Comment</property>
                     <property name="tooltip_text" translatable="yes">Edit Comment</property>
                     <property name="valign">center</property>
                     <property name="image">image3</property>
@@ -155,7 +153,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Remove</property>
                     <property name="tooltip_text" translatable="yes">Remove</property>
                     <property name="valign">center</property>
                     <property name="image">image1</property>
diff --git a/cui/uiconfig/ui/rotationtabpage.ui b/cui/uiconfig/ui/rotationtabpage.ui
index bbcaf35c6c07..7c3e34d757b8 100644
--- a/cui/uiconfig/ui/rotationtabpage.ui
+++ b/cui/uiconfig/ui/rotationtabpage.ui
@@ -129,7 +129,6 @@
                       <object class="svxlo-SvxRectCtl" id="CTL_RECT">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_markup" translatable="yes">Rotation point</property>
                         <property name="tooltip_text" translatable="yes">Rotation point</property>
                         <property name="halign">center</property>
                       </object>
@@ -253,7 +252,6 @@
                       <object class="svxlo-DialControl" id="CTL_ANGLE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_markup" translatable="yes">Rotation Angle</property>
                         <property name="tooltip_text" translatable="yes">Rotation Angle</property>
                         <property name="halign">center</property>
                       </object>
diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui
index 971f6169d186..b49480431526 100644
--- a/cui/uiconfig/ui/textanimtabpage.ui
+++ b/cui/uiconfig/ui/textanimtabpage.ui
@@ -152,7 +152,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">To top</property>
                     <property name="tooltip_text" translatable="yes">To top</property>
                     <property name="halign">center</property>
                     <property name="hexpand">True</property>
@@ -174,7 +173,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">To right</property>
                     <property name="tooltip_text" translatable="yes">To right</property>
                     <property name="halign">center</property>
                     <property name="hexpand">True</property>
@@ -196,7 +194,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">To left</property>
                     <property name="tooltip_text" translatable="yes">To left</property>
                     <property name="halign">center</property>
                     <property name="hexpand">True</property>
@@ -218,7 +215,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">To bottom</property>
                     <property name="tooltip_text" translatable="yes">To bottom</property>
                     <property name="halign">center</property>
                     <property name="hexpand">True</property>
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui b/fpicker/uiconfig/ui/explorerfiledialog.ui
index 3de6a6da14dc..04c4f824d692 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -75,7 +75,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Connect To Server</property>
                         <property name="tooltip_text" translatable="yes">Connect To Server</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="connect_to_server-atkobject">
@@ -111,7 +110,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Create New Folder</property>
                         <property name="tooltip_text" translatable="yes">Create New Folder</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="new_folder-atkobject">
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui
index a25bd4de2ada..bcb3cd2a6013 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -174,7 +174,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">List view</property>
                 <property name="tooltip_text" translatable="yes">List view</property>
                 <property name="image">image2</property>
               </object>
@@ -190,7 +189,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Icon view</property>
                 <property name="tooltip_text" translatable="yes">Icon view</property>
                 <property name="image">image1</property>
               </object>
@@ -209,7 +207,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Create New Folder</property>
                 <property name="tooltip_text" translatable="yes">Create New Folder</property>
                 <property name="margin_left">6</property>
               </object>
diff --git a/sc/uiconfig/scalc/ui/datastreams.ui b/sc/uiconfig/scalc/ui/datastreams.ui
index 26d492ef6ea6..18915175f38e 100644
--- a/sc/uiconfig/scalc/ui/datastreams.ui
+++ b/sc/uiconfig/scalc/ui/datastreams.ui
@@ -60,7 +60,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_markup" translatable="yes">Enter the URL of the source document in the local file system or Internet here.</property>
                                 <property name="tooltip_text" translatable="yes">Enter the URL of the source document in the local file system or Internet here.</property>
                                 <property name="hexpand">True</property>
                                 <property name="has_entry">True</property>
diff --git a/sc/uiconfig/scalc/ui/headerfootercontent.ui b/sc/uiconfig/scalc/ui/headerfootercontent.ui
index d7f5642467a1..c0609951a000 100644
--- a/sc/uiconfig/scalc/ui/headerfootercontent.ui
+++ b/sc/uiconfig/scalc/ui/headerfootercontent.ui
@@ -201,7 +201,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Text Attributes</property>
                 <property name="tooltip_text" translatable="yes">Text Attributes</property>
                 <property name="image">imageBTN_TEXT</property>
               </object>
@@ -231,7 +230,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Sheet Name</property>
                 <property name="tooltip_text" translatable="yes">Sheet Name</property>
                 <property name="image">imageBTN_TABLE</property>
                 <property name="yalign">0.47999998927116394</property>
@@ -248,7 +246,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Page</property>
                 <property name="tooltip_text" translatable="yes">Page</property>
                 <property name="image">imageBTN_PAGE</property>
               </object>
@@ -264,7 +261,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Pages</property>
                 <property name="tooltip_text" translatable="yes">Pages</property>
                 <property name="image">imageBTN_PAGES</property>
                 <property name="yalign">0.49000000953674316</property>
@@ -281,7 +277,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Date</property>
                 <property name="tooltip_text" translatable="yes">Date</property>
                 <property name="image">imageBTN_DATE</property>
                 <property name="yalign">0.37000000476837158</property>
@@ -298,7 +293,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Time</property>
                 <property name="tooltip_text" translatable="yes">Time</property>
                 <property name="image">imageBTN_TIME</property>
                 <property name="yalign">0.41999998688697815</property>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 9aca52f21440..f9efeb2ea2bb 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -657,7 +657,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_markup" translatable="yes">Specify the borders of the selected cells.</property>
                                 <property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
                                 <property name="halign">start</property>
                                 <property name="action_name">.uno:SetBorderStyle</property>
diff --git a/sc/uiconfig/scalc/ui/optcalculatepage.ui b/sc/uiconfig/scalc/ui/optcalculatepage.ui
index 0e6050a5919f..ebc9c031a3e6 100644
--- a/sc/uiconfig/scalc/ui/optcalculatepage.ui
+++ b/sc/uiconfig/scalc/ui/optcalculatepage.ui
@@ -49,7 +49,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_markup" translatable="yes">Disable case sensitivity for interoperability with Microsoft Excel</property>
+                    <property name="tooltip_text" translatable="yes">Disable case sensitivity for interoperability with Microsoft Excel</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -82,7 +82,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_markup" translatable="yes">Enable this for interoperability with Microsoft Excel</property>
+                    <property name="tooltip_text" translatable="yes">Enable this for interoperability with Microsoft Excel</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -99,7 +99,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_markup" translatable="yes">Enable wildcards for interoperability with Microsoft Excel</property>
+                    <property name="tooltip_text" translatable="yes">Enable wildcards for interoperability with Microsoft Excel</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -373,7 +373,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_markup" translatable="yes">Value 0 corresponds to 12/30/1899</property>
+                    <property name="tooltip_text" translatable="yes">Value 0 corresponds to 12/30/1899</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="active">True</property>
@@ -391,7 +391,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_markup" translatable="yes">Value 0 corresponds to 01/01/1900</property>
+                    <property name="tooltip_text" translatable="yes">Value 0 corresponds to 01/01/1900</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
@@ -408,7 +408,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_markup" translatable="yes">0 corresponds to 01/01/1904</property>
+                    <property name="tooltip_text" translatable="yes">0 corresponds to 01/01/1904</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
diff --git a/sc/uiconfig/scalc/ui/pastespecial.ui b/sc/uiconfig/scalc/ui/pastespecial.ui
index 196dca73fba1..b40f85ebdd6c 100644
--- a/sc/uiconfig/scalc/ui/pastespecial.ui
+++ b/sc/uiconfig/scalc/ui/pastespecial.ui
@@ -95,7 +95,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Values Only</property>
                 <property name="tooltip_text" translatable="yes">Values Only</property>
                 <property name="image">img_paste_values_only</property>
               </object>
@@ -111,7 +110,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Values &amp; Formats</property>
                 <property name="tooltip_text" translatable="yes">Values &amp; Formats</property>
                 <property name="image">img_paste_values_formats</property>
               </object>
@@ -127,7 +125,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Transpose</property>
                 <property name="tooltip_text" translatable="yes">Transpose</property>
                 <property name="image">img_paste_transpose</property>
               </object>
diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index b0d3c5f9e5a5..f396fd0d9720 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -40,7 +40,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Horizontal Alignment</property>
                 <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
                 <property name="halign">start</property>
                 <property name="show_arrow">False</property>
@@ -276,7 +275,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Indents from the left edge.</property>
                     <property name="tooltip_text" translatable="yes">Indents from the left edge.</property>
                     <property name="invisible_char">•</property>
                     <accessibility>
@@ -314,7 +312,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Joins the selected cells into one.</property>
                     <property name="tooltip_text" translatable="yes">Joins the selected cells into one.</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
@@ -334,7 +331,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Wrap texts automatically.</property>
                     <property name="tooltip_text" translatable="yes">Wrap texts automatically.</property>
                     <property name="halign">start</property>
                     <property name="xalign">0</property>
@@ -385,7 +381,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Select the angle for rotation.</property>
                 <property name="tooltip_text" translatable="yes">Select the angle for rotation.</property>
                 <accessibility>
                   <relation type="labelled-by" target="orientationlabel"/>
diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
index 31ef17565c96..d3dd5a90208b 100644
--- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
+++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui
@@ -88,7 +88,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Specify the borders of the selected cells.</property>
                     <property name="tooltip_text" translatable="yes">Specify the borders of the selected cells.</property>
                     <property name="halign">start</property>
                     <property name="action_name">.uno:SetBorderStyle</property>
@@ -124,7 +123,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the line style of the borders.</property>
                         <property name="tooltip_text" translatable="yes">Select the line style of the borders.</property>
                         <property name="halign">end</property>
                         <property name="action_name">.uno:LineStyle</property>
@@ -153,7 +151,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the line color of the borders.</property>
                     <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
                     <child>
                       <object class="GtkMenuToolButton" id="linecolor">
@@ -162,7 +159,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the line color of the borders.</property>
                         <property name="tooltip_text" translatable="yes">Select the line color of the borders.</property>
                         <property name="halign">end</property>
                         <property name="hexpand">True</property>
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index a8875e5ca22d..d2e2abac8eb8 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -35,7 +35,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Select a category of contents.</property>
                 <property name="tooltip_text" translatable="yes">Select a category of contents.</property>
                 <property name="hexpand">True</property>
                 <items>
@@ -148,7 +147,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Enter the number of decimal places that you want to display.</property>
                     <property name="tooltip_text" translatable="yes">Enter the number of decimal places that you want to display.</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment1</property>
@@ -183,7 +181,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Enter the number of places for the denominator that you want to display.</property>
                     <property name="tooltip_text" translatable="yes">Enter the number of places for the denominator that you want to display.</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment2</property>
@@ -232,7 +229,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
                     <property name="tooltip_text" translatable="yes">Enter the maximum number of zeroes to display before the decimal point.</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">adjustment1</property>
@@ -271,7 +267,6 @@
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">Changes the font color of negative numbers to red.</property>
             <property name="tooltip_text" translatable="yes">Changes the font color of negative numbers to red.</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
@@ -291,7 +286,6 @@
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">Inserts a separator between thousands.</property>
             <property name="tooltip_text" translatable="yes">Inserts a separator between thousands.</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
@@ -311,7 +305,6 @@
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">Ensures that exponent is a multiple of 3.</property>
             <property name="tooltip_text" translatable="yes">Ensures that exponent is a multiple of 3.</property>
             <property name="use_underline">True</property>
             <property name="xalign">0</property>
diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui b/sc/uiconfig/scalc/ui/solverdlg.ui
index 8f9361c44c44..fb2ae2ab0256 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -739,7 +739,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Remove</property>
                             <property name="tooltip_text" translatable="yes">Remove</property>
                           </object>
                           <packing>
@@ -753,7 +752,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Remove</property>
                             <property name="tooltip_text" translatable="yes">Remove</property>
                           </object>
                           <packing>
@@ -767,7 +765,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Remove</property>
                             <property name="tooltip_text" translatable="yes">Remove</property>
                           </object>
                           <packing>
@@ -781,7 +778,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Remove</property>
                             <property name="tooltip_text" translatable="yes">Remove</property>
                           </object>
                           <packing>
diff --git a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
index 68ac7efe1820..f3b6d725da98 100644
--- a/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
+++ b/sc/uiconfig/scalc/ui/xmlsourcedialog.ui
@@ -44,7 +44,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="tooltip_markup" translatable="yes">Browse to set source file.</property>
+                        <property name="tooltip_text" translatable="yes">Browse to set source file.</property>
                         <property name="image">image1</property>
                       </object>
                       <packing>
diff --git a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
index 4405dafaf398..c469f763beb1 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui
@@ -249,7 +249,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Select the speed of Custom Animation.</property>
                 <property name="tooltip_text" translatable="yes">Select the speed of Custom Animation.</property>
                 <property name="hexpand">True</property>
               </object>
diff --git a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
index d8d1253b4325..67ddd3d264fd 100644
--- a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
+++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui
@@ -108,7 +108,6 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">Select the speed of Custom Animation.</property>
             <property name="tooltip_text" translatable="yes">Select the speed of Custom Animation.</property>
             <property name="hexpand">True</property>
             <property name="adjustment">adjustment1</property>
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui
index ecf3992ac126..a76df350297c 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -166,7 +166,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Remove Image from List</property>
                         <property name="tooltip_text" translatable="yes">Remove Image from List</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -183,7 +182,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Move Image Up</property>
                         <property name="tooltip_text" translatable="yes">Move Image Up</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -200,7 +198,6 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Move Image Down</property>
                         <property name="tooltip_text" translatable="yes">Move Image Down</property>
                         <property name="use_stock">True</property>
                       </object>
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
old mode 100755
new mode 100644
index a1b861cf0d36..cbdcced781ca
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -81,7 +81,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the speed of Slide Transition.</property>
                         <property name="tooltip_text" translatable="yes">Select the speed of Slide Transition.</property>
                         <property name="hexpand">True</property>
                         <property name="adjustment">adjustment1</property>
diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
old mode 100755
new mode 100644
index 652bdf817656..7b354426508a
--- a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui
@@ -65,7 +65,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Select the speed of Slide Transition.</property>
                 <property name="tooltip_text" translatable="yes">Select the speed of Slide Transition.</property>
                 <property name="hexpand">True</property>
               </object>
diff --git a/svx/uiconfig/ui/redlinefilterpage.ui b/svx/uiconfig/ui/redlinefilterpage.ui
index 6f8734a7669d..784c902d129c 100644
--- a/svx/uiconfig/ui/redlinefilterpage.ui
+++ b/svx/uiconfig/ui/redlinefilterpage.ui
@@ -201,7 +201,6 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">Set reference</property>
             <property name="tooltip_text" translatable="yes">Set reference</property>
           </object>
           <packing>
@@ -320,7 +319,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Set current time and date</property>
                 <property name="tooltip_text" translatable="yes">Set current time and date</property>
                 <property name="image">image1</property>
               </object>
@@ -375,7 +373,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Set current time and date</property>
                 <property name="tooltip_text" translatable="yes">Set current time and date</property>
                 <property name="image">image2</property>
               </object>
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index a11a4ea0cb23..1e839ab71a0c 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -37,7 +37,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Fill:</property>
                 <property name="tooltip_text" translatable="yes">Fill:</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Fill:</property>
@@ -64,7 +63,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the color to apply.</property>
                         <property name="tooltip_text" translatable="yes">Select the color to apply.</property>
                         <property name="action_name">.uno:FillColor</property>
                         <property name="use_underline">True</property>
@@ -85,7 +83,6 @@
                   <object class="svxlo-SvxFillAttrBox" id="fillattr">
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the effect to apply.</property>
                     <property name="tooltip_text" translatable="yes">Select the effect to apply.</property>
                     <accessibility>
                       <relation type="labelled-by" target="filllabel"/>
@@ -107,7 +104,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Fill gradient from.</property>
                     <property name="tooltip_text" translatable="yes">Fill gradient from.</property>
                   </object>
                   <packing>
@@ -129,7 +125,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Select the fill type to apply.</property>
                 <property name="tooltip_text" translatable="yes">Select the fill type to apply.</property>
                 <property name="entry_text_column">0</property>
                 <property name="id_column">1</property>
@@ -154,7 +149,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Fill gradient to.</property>
                 <property name="tooltip_text" translatable="yes">Fill gradient to.</property>
               </object>
               <packing>
@@ -172,7 +166,6 @@
                   <object class="GtkComboBoxText" id="gradientstyle">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_markup" translatable="yes">Select the gradient style.</property>
                     <property name="tooltip_text" translatable="yes">Select the gradient style.</property>
                     <items>
                       <item translatable="yes">Linear</item>
@@ -218,7 +211,6 @@
             <child>
               <object class="GtkSpinButton" id="gradangle:0degrees">
                 <property name="can_focus">True</property>
-                <property name="tooltip_markup" translatable="yes">Select the gradient angle.</property>
                 <property name="tooltip_text" translatable="yes">Select the gradient angle.</property>
                 <property name="adjustment">adjustment2</property>
                 <child internal-child="accessible">
@@ -239,7 +231,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Transparency</property>
                 <property name="tooltip_text" translatable="yes">Transparency</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Transparency:</property>
@@ -257,7 +248,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Select the type of transparency to apply.</property>
                 <property name="tooltip_text" translatable="yes">Select the type of transparency to apply.</property>
                 <items>
                   <item translatable="yes">None</item>
@@ -292,7 +282,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Specify the variation of gradient transparency.</property>
                     <property name="tooltip_text" translatable="yes">Specify the variation of gradient transparency.</property>
                     <property name="hexpand">True</property>
                     <property name="action_name">.uno:sidebargradient</property>
@@ -330,7 +319,6 @@
               <object class="GtkScale" id="transparencyslider">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip_markup" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
                 <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
                 <property name="hexpand">True</property>
                 <property name="round_digits">1</property>
@@ -348,7 +336,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
                 <property name="tooltip_text" translatable="yes">Specify 0% for fully opaque through 100% for fully transparent.</property>
                 <property name="max_length">100</property>
                 <property name="invisible_char">•</property>
diff --git a/svx/uiconfig/ui/sidebargraphic.ui b/svx/uiconfig/ui/sidebargraphic.ui
index 2a33b8d0d7d1..dc93f7160174 100644
--- a/svx/uiconfig/ui/sidebargraphic.ui
+++ b/svx/uiconfig/ui/sidebargraphic.ui
@@ -58,7 +58,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Specify the luminance of the graphic.</property>
                 <property name="tooltip_text" translatable="yes">Specify the luminance of the graphic.</property>
                 <property name="invisible_char">•</property>
                 <property name="adjustment">plusminus100adjustment</property>
@@ -96,7 +95,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
                 <property name="tooltip_text" translatable="yes">Specify the degree of difference between the lightest and darkest parts of the graphic.</property>
                 <property name="invisible_char">•</property>
                 <property name="adjustment">plusminus100adjustment</property>
@@ -166,7 +164,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
                 <property name="tooltip_text" translatable="yes">Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.</property>
                 <property name="invisible_char">•</property>
                 <property name="adjustment">0to100adjustment</property>
@@ -209,7 +206,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Red</property>
                     <property name="tooltip_text" translatable="yes">Red</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">plusminus100adjustment</property>
@@ -256,7 +252,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Green</property>
                     <property name="tooltip_text" translatable="yes">Green</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">plusminus100adjustment</property>
@@ -304,7 +299,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Blue</property>
                     <property name="tooltip_text" translatable="yes">Blue</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">plusminus100adjustment</property>
@@ -351,7 +345,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Specify the gamma value that affects the brightness of the midtone values.</property>
                     <property name="tooltip_text" translatable="yes">Specify the gamma value that affects the brightness of the midtone values.</property>
                     <property name="invisible_char">•</property>
                     <property name="adjustment">gammaadjustment</property>
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index b0170c1b9487..43af15ee8a6c 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -37,7 +37,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the style of the beginning arrowhead.</property>
                     <property name="tooltip_text" translatable="yes">Select the style of the beginning arrowhead.</property>
                     <property name="hexpand">True</property>
                     <child internal-child="accessible">
@@ -58,7 +57,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the style of the line.</property>
                     <property name="tooltip_text" translatable="yes">Select the style of the line.</property>
                     <property name="hexpand">True</property>
                     <child internal-child="accessible">
@@ -79,7 +77,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the style of the ending arrowhead.</property>
                     <property name="tooltip_text" translatable="yes">Select the style of the ending arrowhead.</property>
                     <property name="margin_right">6</property>
                     <property name="hexpand">True</property>
@@ -130,7 +127,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the width of the line.</property>
                     <property name="tooltip_text" translatable="yes">Select the width of the line.</property>
                     <child>
                       <object class="GtkMenuToolButton" id="setwidth">
@@ -176,7 +172,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Select the color of the line.</property>
                     <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
                     <child>
                       <object class="GtkMenuToolButton" id="setcolor">
@@ -184,7 +179,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the color of the line.</property>
                         <property name="tooltip_text" translatable="yes">Select the color of the line.</property>
                         <property name="margin_left">20</property>
                         <property name="action_name">.uno:XLineColor</property>
@@ -223,7 +217,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Specify the transparency of the line.</property>
                     <property name="tooltip_text" translatable="yes">Specify the transparency of the line.</property>
                     <property name="halign">start</property>
                     <property name="invisible_char">•</property>
@@ -283,7 +276,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the style of the edge connections.</property>
                         <property name="tooltip_text" translatable="yes">Select the style of the edge connections.</property>
                         <items>
                           <item translatable="yes">Rounded</item>
@@ -331,7 +323,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the style of the line caps.</property>
                         <property name="tooltip_text" translatable="yes">Select the style of the line caps.</property>
                         <items>
                           <item translatable="yes">Flat</item>
diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui
index 7987ba8b10f6..e67d65b25206 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -54,7 +54,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Enter the value for the horizontal position.</property>
                     <property name="tooltip_text" translatable="yes">Enter the value for the horizontal position.</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -95,7 +94,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Enter the value for the vertical position.</property>
                     <property name="tooltip_text" translatable="yes">Enter the value for the vertical position.</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -137,7 +135,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Enter a width for the selected object.</property>
                     <property name="tooltip_text" translatable="yes">Enter a width for the selected object.</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -179,7 +176,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Enter a height for the selected object.</property>
                     <property name="tooltip_text" translatable="yes">Enter a height for the selected object.</property>
                     <property name="invisible_char">•</property>
                     <property name="invisible_char_set">True</property>
@@ -213,7 +209,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Maintain proportions when you resize the selected object.</property>
                 <property name="tooltip_text" translatable="yes">Maintain proportions when you resize the selected object.</property>
                 <property name="use_underline">True</property>
                 <property name="xalign">0</property>
@@ -278,7 +273,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
-                        <property name="tooltip_markup" translatable="yes">Select the angle for rotation.</property>
                         <property name="tooltip_text" translatable="yes">Select the angle for rotation.</property>
                         <property name="hexpand">True</property>
                         <property name="adjustment">adjustment1</property>
@@ -323,7 +317,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_markup" translatable="yes">Flip the selected object vertically.</property>
                                 <property name="tooltip_text" translatable="yes">Flip the selected object vertically.</property>
                                 <property name="action_name">.uno:FlipVertical</property>
                                 <property name="use_underline">True</property>
@@ -338,7 +331,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="tooltip_markup" translatable="yes">Flip the selected object horizontally.</property>
                                 <property name="tooltip_text" translatable="yes">Flip the selected object horizontally.</property>
                                 <property name="action_name">.uno:FlipHorizontal</property>
                                 <property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/addressblockdialog.ui b/sw/uiconfig/swriter/ui/addressblockdialog.ui
index 0b4fd2596b91..1de46e6afb5e 100644
--- a/sw/uiconfig/swriter/ui/addressblockdialog.ui
+++ b/sw/uiconfig/swriter/ui/addressblockdialog.ui
@@ -307,7 +307,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Remove from address</property>
                     <property name="tooltip_text" translatable="yes">Remove from address</property>
                     <property name="image">image6</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/cardmediumpage.ui b/sw/uiconfig/swriter/ui/cardmediumpage.ui
index 52509aa4368a..eb4df8baf9c2 100644
--- a/sw/uiconfig/swriter/ui/cardmediumpage.ui
+++ b/sw/uiconfig/swriter/ui/cardmediumpage.ui
@@ -252,7 +252,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_markup" translatable="yes">Insert</property>
+                    <property name="tooltip_text" translatable="yes">Insert</property>
                     <property name="valign">center</property>
                     <property name="image">image1</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/envaddresspage.ui b/sw/uiconfig/swriter/ui/envaddresspage.ui
index 76b988a9d16b..75f08f1e814c 100644
--- a/sw/uiconfig/swriter/ui/envaddresspage.ui
+++ b/sw/uiconfig/swriter/ui/envaddresspage.ui
@@ -234,7 +234,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_markup" translatable="yes">Insert</property>
+            <property name="tooltip_text" translatable="yes">Insert</property>
             <property name="valign">center</property>
             <property name="image">image1</property>
           </object>
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 845e6e1688e8..7e8dc99344d8 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -455,7 +455,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Apply</property>
                     <property name="tooltip_text" translatable="yes">Apply</property>
                     <property name="action_name">apply</property>
                     <property name="use_underline">True</property>
@@ -471,7 +470,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Delete</property>
                     <property name="tooltip_text" translatable="yes">Delete</property>
                     <property name="action_name">delete</property>
                     <property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui b/sw/uiconfig/swriter/ui/tocentriespage.ui
index d4068e5d020e..36269d765774 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -887,7 +887,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_markup" translatable="yes">Ascending</property>
+                            <property name="tooltip_text" translatable="yes">Ascending</property>
                             <property name="image">image1</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
@@ -904,7 +904,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_markup" translatable="yes">Descending</property>
+                            <property name="tooltip_text" translatable="yes">Descending</property>
                             <property name="image">image2</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -921,7 +921,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Ascending</property>
                             <property name="tooltip_text" translatable="yes">Ascending</property>
                             <property name="image">image3</property>
                             <property name="xalign">0</property>
@@ -939,7 +938,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Ascending</property>
                             <property name="tooltip_text" translatable="yes">Ascending</property>
                             <property name="image">image4</property>
                             <property name="xalign">0</property>
@@ -957,7 +955,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Descending</property>
                             <property name="tooltip_text" translatable="yes">Descending</property>
                             <property name="image">image5</property>
                             <property name="xalign">0</property>
@@ -975,7 +972,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Descending</property>
                             <property name="tooltip_text" translatable="yes">Descending</property>
                             <property name="image">image6</property>
                             <property name="xalign">0</property>