Rm deprecated budget widgets

14 files changed, 184 insertions, 222 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index e432ee02f..a076a58c7 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -147,7 +147,6 @@ set(ui_SRC
 	widget/iconrenderer.cpp
 	widget/alignment-selector.cpp
 	widget/anchor-selector.cpp
-	widget/button.cpp
 	widget/clipmaskicon.cpp
 	widget/color-entry.cpp
 	widget/color-icc-selector.cpp
@@ -371,7 +370,6 @@ set(ui_SRC
 	widget/alignment-selector.h
 	widget/anchor-selector.h
 	widget/attr-widget.h
-	widget/button.h
 	widget/clipmaskicon.h
 	widget/color-entry.h
 	widget/color-icc-selector.h
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 255ecec9d..95b85471f 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -138,8 +138,8 @@ Export::Export () :
     browse_label(_("_Export As..."), true),
     browse_image(),
     batch_box(false, 5),
-    batch_export(_("B_atch export all selected objects"), _("Export each selected object into its own PNG file, using export hints if any (caution, overwrites without asking!)")),
-    interlacing(_("Use interlacing"),_("Enables ADAM7 interlacing for PNG output. This results in slightly heavier images, but big images will look better sooner when loading the file")),
+    batch_export(_("B_atch export all selected objects")),
+    interlacing(_("Use interlacing")),
     bitdepth_label(_("Bit depth")),
     bitdepth_cb(),
     zlib_label(_("Compression")),
@@ -149,8 +149,8 @@ Export::Export () :
     antialiasing_label(_("Antialiasing")),
     antialiasing_cb(),
     hide_box(false, 5),
-    hide_export(_("Hide all except selected"), _("In the exported image, hide all objects except those that are selected")),
-    closeWhenDone(_("Close when complete"), _("Once the export completes, close this dialog")),
+    hide_export(_("Hide all except selected")),
+    closeWhenDone(_("Close when complete")),
     button_box(false, 3),
     _prog(),
     prog_dlg(nullptr),
@@ -162,6 +162,14 @@ Export::Export () :
     subselChangedConn(),
     selectModifiedConn()
 {
+    batch_export.set_use_underline();
+    batch_export.set_tooltip_text(_("Export each selected object into its own PNG file, using export hints if any (caution, overwrites without asking!)"));
+    hide_export.set_use_underline();
+    hide_export.set_tooltip_text(_("In the exported image, hide all objects except those that are selected"));
+    interlacing.set_use_underline();
+    interlacing.set_tooltip_text(_("Enables ADAM7 interlacing for PNG output. This results in slightly heavier images, but big images will look better sooner when loading the file"));
+    closeWhenDone.set_use_underline();
+    closeWhenDone.set_tooltip_text(_("Once the export completes, close this dialog"));
     prefs = Inkscape::Preferences::get();
 
     singleexport_box.set_border_width(0);
diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h
index 7f4a46afe..9210ac545 100644
--- a/src/ui/dialog/export.h
+++ b/src/ui/dialog/export.h
@@ -20,7 +20,6 @@
 
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/panel.h"
-#include "ui/widget/button.h"
 
 namespace Gtk {
 class Dialog;
@@ -311,16 +310,16 @@ private:
     Gtk::Image browse_image;
 
     Gtk::HBox batch_box;
-    Inkscape::UI::Widget::CheckButton    batch_export;
+    Gtk::CheckButton    batch_export;
 
     Gtk::HBox hide_box;
-    Inkscape::UI::Widget::CheckButton    hide_export;
+    Gtk::CheckButton    hide_export;
 
-    Inkscape::UI::Widget::CheckButton closeWhenDone;
+    Gtk::CheckButton closeWhenDone;
 
     /* Advanced */
     Gtk::Expander expander;
-    Inkscape::UI::Widget::CheckButton interlacing;
+    Gtk::CheckButton interlacing;
     Gtk::Label                        bitdepth_label;
     Gtk::ComboBoxText                 bitdepth_cb;
     Gtk::Label                        zlib_label;
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index af7241ef2..020292217 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -63,54 +63,128 @@ Find::Find()
       entry_find(_("F_ind:"), _("Find objects by their content or properties (exact or partial match)")),
       entry_replace(_("R_eplace:"), _("Replace match with this value")),
 
-      check_scope_all(_("_All"), _("Search in all layers")),
-      check_scope_layer(_("Current _layer"), _("Limit search to the current layer")),
-      check_scope_selection(_("Sele_ction"), _("Limit search to the current selection")),
-      check_searchin_text(_("_Text"), _("Search in text objects")),
-      check_searchin_property(_("_Properties"), _("Search in object properties, styles, attributes and IDs")),
+      check_scope_all(_("_All")),
+      check_scope_layer(_("Current _layer")),
+      check_scope_selection(_("Sele_ction")),
+      check_searchin_text(_("_Text")),
+      check_searchin_property(_("_Properties")),
       vbox_searchin(false, false),
       frame_searchin(_("Search in")),
       frame_scope(_("Scope")),
 
-      check_case_sensitive(_("Case sensiti_ve"), _("Match upper/lower case"), false),
-      check_exact_match(_("E_xact match"), _("Match whole objects only"), false),
-      check_include_hidden(_("Include _hidden"), _("Include hidden objects in search"), false),
-      check_include_locked(_("Include loc_ked"), _("Include locked objects in search"), false),
+      check_case_sensitive(_("Case sensiti_ve")),
+      check_exact_match(_("E_xact match")),
+      check_include_hidden(_("Include _hidden")),
+      check_include_locked(_("Include loc_ked")),
       expander_options(_("Options")),
       frame_options(_("General")),
 
-      check_ids(_("_ID"), _("Search id name"), true),
-      check_attributename(_("Attribute _name"), _("Search attribute name"), false),
-      check_attributevalue(_("Attri_bute value"), _("Search attribute value"), true),
-      check_style(_("_Style"), _("Search style"), true),
-      check_font(_("F_ont"), _("Search fonts"), false),
+      check_ids(_("_ID")),
+      check_attributename(_("Attribute _name")),
+      check_attributevalue(_("Attri_bute value")),
+      check_style(_("_Style")),
+      check_font(_("F_ont")),
       frame_properties(_("Properties")),
 
-      check_alltypes(_("All types"), _("Search all object types"), true),
-      check_rects(_("Rectangles"), _("Search rectangles"), false),
-      check_ellipses(_("Ellipses"), _("Search ellipses, arcs, circles"), false),
-      check_stars(_("Stars"), _("Search stars and polygons"), false),
-      check_spirals(_("Spirals"), _("Search spirals"), false),
-      check_paths(_("Paths"), _("Search paths, lines, polylines"), false),
-      check_texts(_("Texts"), _("Search text objects"), false),
-      check_groups(_("Groups"), _("Search groups"), false),
+      check_alltypes(_("All types")),
+      check_rects(_("Rectangles")),
+      check_ellipses(_("Ellipses")),
+      check_stars(_("Stars")),
+      check_spirals(_("Spirals")),
+      check_paths(_("Paths")),
+      check_texts(_("Texts")),
+      check_groups(_("Groups")),
       check_clones(
                     //TRANSLATORS: "Clones" is a noun indicating type of object to find
-                    C_("Find dialog", "Clones"), _("Search clones"), false),
+                    C_("Find dialog", "Clones")),
 
-      check_images(_("Images"), _("Search images"), false),
-      check_offsets(_("Offsets"), _("Search offset objects"), false),
+      check_images(_("Images")),
+      check_offsets(_("Offsets")),
       frame_types(_("Object types")),
 
       status(""),
-      button_find(_("_Find"), _("Select all objects matching the selection criteria")),
-      button_replace(_("_Replace All"), _("Replace all matches")),
+      button_find(_("_Find")),
+      button_replace(_("_Replace All")),
       _action_replace(false),
       blocked(false),
       desktop(nullptr),
       deskTrack()
 
 {
+    button_find.set_use_underline();
+    button_find.set_tooltip_text(_("Select all objects matching the selection criteria"));
+    button_replace.set_use_underline();
+    button_replace.set_tooltip_text(_("Replace all matches"));
+    check_scope_all.set_use_underline();
+    check_scope_all.set_tooltip_text(_("Search in all layers"));
+    check_scope_layer.set_use_underline();
+    check_scope_layer.set_tooltip_text(_("Limit search to the current layer"));
+    check_scope_selection.set_use_underline();
+    check_scope_selection.set_tooltip_text(_("Limit search to the current selection"));
+    check_searchin_text.set_use_underline();
+    check_searchin_text.set_tooltip_text(_("Search in text objects"));
+    check_searchin_property.set_use_underline();
+    check_searchin_property.set_tooltip_text(_("Search in object properties, styles, attributes and IDs"));
+    check_case_sensitive.set_use_underline();
+    check_case_sensitive.set_tooltip_text(_("Match upper/lower case"));
+    check_case_sensitive.set_active(false);
+    check_exact_match.set_use_underline();
+    check_exact_match.set_tooltip_text(_("Match whole objects only"));
+    check_exact_match.set_active(false);
+    check_include_hidden.set_use_underline();
+    check_include_hidden.set_tooltip_text(_("Include hidden objects in search"));
+    check_include_hidden.set_active(false);
+    check_include_locked.set_use_underline();
+    check_include_locked.set_tooltip_text(_("Include locked objects in search"));
+    check_include_locked.set_active(false);
+    check_ids.set_use_underline();
+    check_ids.set_tooltip_text(_("Search id name"));
+    check_ids.set_active(true);
+    check_attributename.set_use_underline();
+    check_attributename.set_tooltip_text(_("Search attribute name"));
+    check_attributename.set_active(false);
+    check_attributevalue.set_use_underline();
+    check_attributevalue.set_tooltip_text(_("Search attribute value"));
+    check_attributevalue.set_active(true);
+    check_style.set_use_underline();
+    check_style.set_tooltip_text(_("Search style"));
+    check_style.set_active(true);
+    check_font.set_use_underline();
+    check_font.set_tooltip_text(_("Search fonts"));
+    check_font.set_active(false);
+    check_alltypes.set_use_underline();
+    check_alltypes.set_tooltip_text(_("Search all object types"));
+    check_alltypes.set_active(true);
+    check_rects.set_use_underline();
+    check_rects.set_tooltip_text(_("Search rectangles"));
+    check_rects.set_active(false);
+    check_ellipses.set_use_underline();
+    check_ellipses.set_tooltip_text(_("Search ellipses, arcs, circles"));
+    check_ellipses.set_active(false);
+    check_stars.set_use_underline();
+    check_stars.set_tooltip_text(_("Search stars and polygons"));
+    check_stars.set_active(false);
+    check_spirals.set_use_underline();
+    check_spirals.set_tooltip_text(_("Search spirals"));
+    check_spirals.set_active(false);
+    check_paths.set_use_underline();
+    check_paths.set_tooltip_text(_("Search paths, lines, polylines"));
+    check_paths.set_active(false);
+    check_texts.set_use_underline();
+    check_texts.set_tooltip_text(_("Search text objects"));
+    check_texts.set_active(false);
+    check_groups.set_use_underline();
+    check_groups.set_tooltip_text(_("Search groups"));
+    check_groups.set_active(false),
+    check_clones.set_use_underline();
+    check_clones.set_tooltip_text(_("Search clones"));
+    check_clones.set_active(false);
+    check_images.set_use_underline();
+    check_images.set_tooltip_text(_("Search images"));
+    check_images.set_active(false);
+    check_offsets.set_use_underline();
+    check_offsets.set_tooltip_text(_("Search offset objects"));
+    check_offsets.set_active(false);
     entry_find.getEntry()->set_width_chars(25);
     entry_replace.getEntry()->set_width_chars(25);
 
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 4f305b8c8..14b7f8c55 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -14,7 +14,6 @@
 #define INKSCAPE_UI_DIALOG_FIND_H
 
 #include "ui/widget/panel.h"
-#include "ui/widget/button.h"
 #include "ui/widget/entry.h"
 #include "ui/widget/frame.h"
 
@@ -22,6 +21,7 @@
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/label.h>
+#include <gtkmm/radiobutton.h>
 
 #include "ui/dialog/desktop-tracker.h"
 
@@ -208,11 +208,11 @@ private:
     /**
      * Scope and search in widgets
      */
-    UI::Widget::RadioButton    check_scope_all;
-    UI::Widget::RadioButton    check_scope_layer;
-    UI::Widget::RadioButton    check_scope_selection;
-    UI::Widget::RadioButton    check_searchin_text;
-    UI::Widget::RadioButton    check_searchin_property;
+    Gtk::RadioButton    check_scope_all;
+    Gtk::RadioButton    check_scope_layer;
+    Gtk::RadioButton    check_scope_selection;
+    Gtk::RadioButton    check_searchin_text;
+    Gtk::RadioButton    check_searchin_property;
     Gtk::HBox hbox_searchin;
     Gtk::VBox vbox_scope;
     Gtk::VBox vbox_searchin;
@@ -222,10 +222,10 @@ private:
     /**
      * General option widgets
      */
-    UI::Widget::CheckButton    check_case_sensitive;
-    UI::Widget::CheckButton    check_exact_match;
-    UI::Widget::CheckButton    check_include_hidden;
-    UI::Widget::CheckButton    check_include_locked;
+    Gtk::CheckButton    check_case_sensitive;
+    Gtk::CheckButton    check_exact_match;
+    Gtk::CheckButton    check_include_hidden;
+    Gtk::CheckButton    check_include_locked;
     Gtk::VBox vbox_options1;
     Gtk::VBox vbox_options2;
     Gtk::HBox hbox_options;
@@ -236,11 +236,11 @@ private:
     /**
      * Property type widgets
      */
-    UI::Widget::CheckButton    check_ids;
-    UI::Widget::CheckButton    check_attributename;
-    UI::Widget::CheckButton    check_attributevalue;
-    UI::Widget::CheckButton    check_style;
-    UI::Widget::CheckButton    check_font;
+    Gtk::CheckButton    check_ids;
+    Gtk::CheckButton    check_attributename;
+    Gtk::CheckButton    check_attributevalue;
+    Gtk::CheckButton    check_style;
+    Gtk::CheckButton    check_font;
     Gtk::VBox vbox_properties;
     Gtk::HBox hbox_properties1;
     Gtk::HBox hbox_properties2;
@@ -249,22 +249,22 @@ private:
     /**
      * A vector of all the properties widgets for easy processing
      */
-    std::vector<UI::Widget::CheckButton *> checkProperties;
+    std::vector<Gtk::CheckButton *> checkProperties;
 
     /**
      * Object type widgets
      */
-    UI::Widget::CheckButton    check_alltypes;
-    UI::Widget::CheckButton    check_rects;
-    UI::Widget::CheckButton    check_ellipses;
-    UI::Widget::CheckButton    check_stars;
-    UI::Widget::CheckButton    check_spirals;
-    UI::Widget::CheckButton    check_paths;
-    UI::Widget::CheckButton    check_texts;
-    UI::Widget::CheckButton    check_groups;
-    UI::Widget::CheckButton    check_clones;
-    UI::Widget::CheckButton    check_images;
-    UI::Widget::CheckButton    check_offsets;
+    Gtk::CheckButton    check_alltypes;
+    Gtk::CheckButton    check_rects;
+    Gtk::CheckButton    check_ellipses;
+    Gtk::CheckButton    check_stars;
+    Gtk::CheckButton    check_spirals;
+    Gtk::CheckButton    check_paths;
+    Gtk::CheckButton    check_texts;
+    Gtk::CheckButton    check_groups;
+    Gtk::CheckButton    check_clones;
+    Gtk::CheckButton    check_images;
+    Gtk::CheckButton    check_offsets;
     Gtk::VBox vbox_types1;
     Gtk::VBox vbox_types2;
     Gtk::HBox hbox_types;
@@ -273,7 +273,7 @@ private:
     /**
      * A vector of all the check option widgets for easy processing
      */
-    std::vector<UI::Widget::CheckButton *> checkTypes;
+    std::vector<Gtk::CheckButton *> checkTypes;
 
     //Gtk::HBox hbox_text;
 
@@ -281,8 +281,8 @@ private:
      * Action Buttons and status
      */
     Gtk::Label status;
-    UI::Widget::Button button_find;
-    UI::Widget::Button button_replace;
+    Gtk::Button button_find;
+    Gtk::Button button_replace;
     Gtk::ButtonBox box_buttons;
     Gtk::HBox hboxbutton_row;
 
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index a4027832a..3b72f1feb 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -40,14 +40,18 @@ namespace Dialogs {
 
 GuidelinePropertiesDialog::GuidelinePropertiesDialog(SPGuide *guide, SPDesktop *desktop)
 : _desktop(desktop), _guide(guide),
-  _locked_toggle(_("Lo_cked"), _("Lock the movement of guides")),
-  _relative_toggle(_("Rela_tive change"), _("Move and/or rotate the guide relative to current settings")),
+  _locked_toggle(_("Lo_cked")),
+  _relative_toggle(_("Rela_tive change")),
   _spin_button_x(C_("Guides", "_X:"), "", UNIT_TYPE_LINEAR, "", "", &_unit_menu),
   _spin_button_y(C_("Guides", "_Y:"), "", UNIT_TYPE_LINEAR, "", "", &_unit_menu),
   _label_entry(_("_Label:"), _("Optionally give this guideline a name")),
   _spin_angle(_("_Angle:"), "", UNIT_TYPE_RADIAL),
   _mode(true), _oldpos(0.,0.), _oldangle(0.0)
 {
+    _locked_toggle.set_use_underline();
+    _locked_toggle.set_tooltip_text(_("Lock the movement of guides"));
+    _relative_toggle.set_use_underline();
+    _relative_toggle.set_tooltip_text(_("Move and/or rotate the guide relative to current settings"));
 }
 
 bool GuidelinePropertiesDialog::_relative_toggle_status = false; // initialize relative checkbox status for when this dialog is opened for first time
diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h
index 2da8b4911..637eb4d0e 100644
--- a/src/ui/dialog/guides.h
+++ b/src/ui/dialog/guides.h
@@ -12,12 +12,12 @@
 #ifndef INKSCAPE_DIALOG_GUIDELINE_H
 #define INKSCAPE_DIALOG_GUIDELINE_H
 
+#include <gtkmm/checkbutton.h>
+#include <gtkmm/colorbutton.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/grid.h>
-
 #include <gtkmm/label.h>
-#include <gtkmm/colorbutton.h>
-#include "ui/widget/button.h"
+
 #include "ui/widget/unit-menu.h"
 #include "ui/widget/scalar-unit.h"
 #include "ui/widget/entry.h"
@@ -66,8 +66,8 @@ private:
     Gtk::Grid   _layout_table;
     Gtk::Label  _label_name;
     Gtk::Label  _label_descr;
-    Inkscape::UI::Widget::CheckButton _locked_toggle;
-    Inkscape::UI::Widget::CheckButton _relative_toggle;
+    Gtk::CheckButton _locked_toggle;
+    Gtk::CheckButton _relative_toggle;
     static bool _relative_toggle_status; // remember the status of the _relative_toggle_status button across instances
     Inkscape::UI::Widget::UnitMenu _unit_menu;
     Inkscape::UI::Widget::ScalarUnit _spin_button_x;
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index c4ea5d9b1..2a6cb9ebe 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1944,14 +1944,20 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui
     box_buttons->set_hexpand();
     _page_keyshortcuts.attach(*box_buttons, 0, row, 3, 1);
 
-    UI::Widget::Button *kb_reset = Gtk::manage(new UI::Widget::Button(_("Reset"), _("Remove all your customized keyboard shortcuts, and revert to the shortcuts in the shortcut file listed above")));
+    auto kb_reset = Gtk::manage(new Gtk::Button(_("Reset")));
+    kb_reset->set_use_underline();
+    kb_reset->set_tooltip_text(_("Remove all your customized keyboard shortcuts, and revert to the shortcuts in the shortcut file listed above"));
     box_buttons->pack_start(*kb_reset, true, true, 6);
     box_buttons->set_child_secondary(*kb_reset);
 
-    UI::Widget::Button *kb_import = Gtk::manage(new UI::Widget::Button(_("Import ..."), _("Import custom keyboard shortcuts from a file")));
+    auto kb_import = Gtk::manage(new Gtk::Button(_("Import ...")));
+    kb_import->set_use_underline();
+    kb_import->set_tooltip_text(_("Import custom keyboard shortcuts from a file"));
     box_buttons->pack_end(*kb_import, true, true, 6);
 
-    UI::Widget::Button *kb_export = Gtk::manage(new UI::Widget::Button(_("Export ..."), _("Export custom keyboard shortcuts to a file")));
+    auto kb_export = Gtk::manage(new Gtk::Button(_("Export ...")));
+    kb_export->set_use_underline();
+    kb_export->set_tooltip_text(_("Export custom keyboard shortcuts to a file"));
     box_buttons->pack_end(*kb_export, true, true, 6);
 
     kb_reset->signal_clicked().connect( sigc::mem_fun(*this, &InkscapePreferences::onKBReset) );
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 124b29139..f375a4cab 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -19,7 +19,6 @@
 #include <iostream>
 #include <vector>
 #include "ui/widget/preferences-widget.h"
-#include "ui/widget/button.h"
 #include <cstddef>
 #include <gtkmm/colorbutton.h>
 #include <gtkmm/comboboxtext.h>
@@ -359,7 +358,7 @@ protected:
     UI::Widget::PrefCheckButton _misc_namedicon_delay;
 
     // System page
-    // UI::Widget::Button         *_apply_theme;
+    // Gtk::Button         *_apply_theme;
     UI::Widget::PrefSpinButton  _misc_latency_skew;
     UI::Widget::PrefSpinButton  _misc_simpl;
     Gtk::Entry                  _sys_user_prefs;
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index a074f081b..7edacc4ce 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -86,12 +86,20 @@ Transformation::Transformation()
       _counterclockwise_rotate (),
       _clockwise_rotate (),
 
-      _check_move_relative    (_("Rela_tive move"), _("Add the specified relative displacement to the current position; otherwise, edit the current absolute position directly")),
-      _check_scale_proportional (_("_Scale proportionally"), _("Preserve the width/height ratio of the scaled objects")),
-      _check_apply_separately    (_("Apply to each _object separately"), _("Apply the scale/rotate/skew to each selected object separately; otherwise, transform the selection as a whole")),
-      _check_replace_matrix    (_("Edit c_urrent matrix"), _("Edit the current transform= matrix; otherwise, post-multiply transform= by this matrix"))
+      _check_move_relative    (_("Rela_tive move")),
+      _check_scale_proportional (_("_Scale proportionally")),
+      _check_apply_separately    (_("Apply to each _object separately")),
+      _check_replace_matrix    (_("Edit c_urrent matrix"))
 
 {
+    _check_move_relative.set_use_underline();
+    _check_move_relative.set_tooltip_text(_("Add the specified relative displacement to the current position; otherwise, edit the current absolute position directly"));
+    _check_scale_proportional.set_use_underline();
+    _check_scale_proportional.set_tooltip_text(_("Preserve the width/height ratio of the scaled objects"));
+    _check_apply_separately.set_use_underline();
+    _check_apply_separately.set_tooltip_text(_("Apply the scale/rotate/skew to each selected object separately; otherwise, transform the selection as a whole"));
+    _check_replace_matrix.set_use_underline();
+    _check_replace_matrix.set_tooltip_text(_("Edit the current transform= matrix; otherwise, post-multiply transform= by this matrix"));
     Gtk::Box *contents = _getContents();
 
     contents->set_spacing(0);
diff --git a/src/ui/dialog/transformation.h b/src/ui/dialog/transformation.h
index 98c0bab17..f50e21455 100644
--- a/src/ui/dialog/transformation.h
+++ b/src/ui/dialog/transformation.h
@@ -19,7 +19,6 @@
 #include "ui/widget/panel.h"
 #include "ui/widget/notebook-page.h"
 #include "ui/widget/scalar-unit.h"
-#include "ui/widget/button.h"
 #include "ui/dialog/desktop-tracker.h"
 
 
@@ -148,10 +147,10 @@ protected:
     Gtk::RadioButton         _counterclockwise_rotate;
     Gtk::RadioButton         _clockwise_rotate;
 
-    UI::Widget::CheckButton  _check_move_relative;
-    UI::Widget::CheckButton  _check_scale_proportional;
-    UI::Widget::CheckButton  _check_apply_separately;
-    UI::Widget::CheckButton  _check_replace_matrix;
+    Gtk::CheckButton  _check_move_relative;
+    Gtk::CheckButton  _check_scale_proportional;
+    Gtk::CheckButton  _check_apply_separately;
+    Gtk::CheckButton  _check_replace_matrix;
 
     SPDesktop *_desktop;
     DesktopTracker _deskTrack;
diff --git a/src/ui/widget/button.cpp b/src/ui/widget/button.cpp
deleted file mode 100644
index a587cb0cb..000000000
--- a/src/ui/widget/button.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Author:
- *   buliabyak@gmail.com
- *
- * Copyright (C) 2005 author
- *
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-#include "button.h"
-
-namespace Inkscape {
-namespace UI {
-namespace Widget {
-
-Button::Button(Glib::ustring const &label, Glib::ustring const &tooltip)
-{
-    set_use_underline (true);
-    set_label (label);
-    set_tooltip_text(tooltip);
-}
-
-CheckButton::CheckButton(Glib::ustring const &label, Glib::ustring const &tooltip)
-{
-    set_use_underline (true);
-    set_label (label);
-    set_tooltip_text(tooltip);
-}
-
-CheckButton::CheckButton(Glib::ustring const &label, Glib::ustring const &tooltip, bool active)
-{
-    set_use_underline (true);
-    set_label (label);
-    set_tooltip_text(tooltip);
-    set_active(active);
-}
-
-RadioButton::RadioButton(Glib::ustring const &label, Glib::ustring const &tooltip)
-{
-    set_use_underline (true);
-    set_label (label);
-    set_tooltip_text(tooltip);
-}
-
-
-} // namespace Widget
-} // namespace UI
-} // namespace Inkscape
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/widget/button.h b/src/ui/widget/button.h
deleted file mode 100644
index cf8c74c69..000000000
--- a/src/ui/widget/button.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Author:
- *   buliabyak@gmail.com
- *
- * Copyright (C) 2005 author
- *
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-#ifndef INKSCAPE_UI_WIDGET_BUTTON_H
-#define INKSCAPE_UI_WIDGET_BUTTON_H
-
-#include <gtkmm/checkbutton.h>
-#include <gtkmm/radiobutton.h>
-
-namespace Inkscape {
-namespace UI {
-namespace Widget {
-
-/**
- * Button widget.
- * @deprecated - no need for an explicit subclass... just perhaps a helper function.
- */
-class Button : public Gtk::Button
-{
-public:
-    Button();
-    Button(Glib::ustring const &label, Glib::ustring const &tooltip);
-};
-
-/**
- * CheckButton widget.
- * @deprecated - no need for an explicit subclass... just perhaps a helper function.
- */
-class CheckButton : public Gtk::CheckButton
-{
-public:
-    CheckButton();
-    CheckButton(Glib::ustring const &label, Glib::ustring const &tooltip);
-    CheckButton(Glib::ustring const &label, Glib::ustring const &tooltip, bool active);
-
-};
-
-/**
- * RadioButton widget.
- * @deprecated - no need for an explicit subclass... just perhaps a helper function.
- */
-class RadioButton : public Gtk::RadioButton
-{
-public:
-    RadioButton();
-    RadioButton(Glib::ustring const &label, Glib::ustring const &tooltip);
-
-};
-
-} // namespace Widget
-} // namespace UI
-} // namespace Inkscape
-
-#endif // INKSCAPE_UI_WIDGET_BUTTON_H
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 01a38af73..030e90af0 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -25,7 +25,6 @@
 #include "verbs.h"
 #include "helper/action.h"
 #include "object/sp-root.h"
-#include "ui/widget/button.h"
 #include "io/resource.h"
 
 using std::pair;