diff --git a/AUTHORS b/AUTHORS
index 9d7b5369b6..6ff7cbddb7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -362,6 +362,12 @@ Icons from the Elementary icon theme (GPLv3)
 * src/tiled/images/32/dialog-error.png
 * src/tiled/images/32/dialog-warning.png
 
+Icons from the GNOME project (CC0 1.0 Universal)
+* src/tiled/resources/images/scalable/text-bold-symbolic.svg
+* src/tiled/resources/images/scalable/text-italic-symbolic.svg
+* src/tiled/resources/images/scalable/text-underline-symbolic.svg
+* src/tiled/resources/images/scalable/text-strikethrough-symbolic.svg
+
 
 Tilesets:
 
diff --git a/src/tiled/resources/images/scalable/text-bold-symbolic.svg b/src/tiled/resources/images/scalable/text-bold-symbolic.svg
new file mode 100644
index 0000000000..bdbddea8d2
--- /dev/null
+++ b/src/tiled/resources/images/scalable/text-bold-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 4 3 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 h 5.03125 c 0.558594 0 0.980469 0.429688 0.976562 0.988281 l -0.015624 1.011719 h -2.945313 c -0.070313 -0.003906 -0.136719 -0.003906 -0.207031 0 h -1.753906 c -1.644532 -0.058594 -3.046876 1.246094 -3.105469 2.894531 v 0.035157 c 0.003906 1.683593 1.390625 3.070312 3.074219 3.070312 h 5.875 c 1.683593 0 3.070312 -1.390625 3.070312 -3.074219 l -0.003906 -3.929687 c 0 -1.640625 -1.359375 -2.996094 -3.003906 -2.996094 z m 2.976562 6 h 2.988282 l -0.007813 0.914062 c -0.011719 0.613282 -0.488281 1.085938 -1.101562 1.085938 h -1.839844 c -0.597656 0 -1.054687 -0.460938 -1.066406 -1.054688 c 0.03125 -0.550781 0.46875 -0.964843 1.027343 -0.945312 z m 0 0" fill="#222222"/></svg>
diff --git a/src/tiled/resources/images/scalable/text-italic-symbolic.svg b/src/tiled/resources/images/scalable/text-italic-symbolic.svg
new file mode 100644
index 0000000000..9fa6e67de6
--- /dev/null
+++ b/src/tiled/resources/images/scalable/text-italic-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 6.574219 5 h 5 c 0.246093 0 0.425781 0.265625 0.335937 0.496094 l -1.65625 4.207031 c -0.304687 0.78125 -1.0625 1.296875 -1.898437 1.296875 h -3.921875 c -0.285156 0 -0.488282 -0.300781 -0.386719 -0.566406 l 0.054687 -0.140625 c 0.308594 -0.777344 1.058594 -1.292969 1.898438 -1.292969 h 6 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 h -6 c -1.660156 0 -3.152344 1.019531 -3.761719 2.566406 l -0.054687 0.140625 c -0.621094 1.589844 0.539062 3.292969 2.25 3.292969 h 3.921875 c 1.660156 0 3.152343 -1.015625 3.761719 -2.5625 l 1.65625 -4.210938 c 0.613281 -1.558593 -0.527344 -3.226562 -2.199219 -3.226562 h -5 c -0.554688 0 -1 0.449219 -1 1 s 0.445312 1 1 1 z m 0 0" fill="#222222"/></svg>
diff --git a/src/tiled/resources/images/scalable/text-strikethrough-symbolic.svg b/src/tiled/resources/images/scalable/text-strikethrough-symbolic.svg
new file mode 100644
index 0000000000..6df152de47
--- /dev/null
+++ b/src/tiled/resources/images/scalable/text-strikethrough-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><g fill="#222222"><path d="m 4 3 v 2 h 6 c 0.429688 0 1 0.613281 1 1 h 2 c 0 -1.632812 -1.320312 -3 -3 -3 z m -1 7 c 0.003906 0.71875 0.269531 1.453125 0.78125 2.03125 s 1.308594 0.96875 2.21875 0.96875 h 7 v -3 h -2 v 1 h -5 c -0.398438 0 -0.566406 -0.109375 -0.71875 -0.28125 s -0.277344 -0.4375 -0.28125 -0.71875 z m 0 0"/><path d="m 1 7 v 2 h 14 v -2 z m 0 0"/></g></svg>
diff --git a/src/tiled/resources/images/scalable/text-underline-symbolic.svg b/src/tiled/resources/images/scalable/text-underline-symbolic.svg
new file mode 100644
index 0000000000..ff520eb3c7
--- /dev/null
+++ b/src/tiled/resources/images/scalable/text-underline-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><g fill="#222222"><path d="m 2 14 c 0 0.550781 0.449219 1 1 1 h 10 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 h -10 c -0.550781 0 -1 0.449219 -1 1 z m 0 0"/><path d="m 5 4 h 5 c 0.546875 0 1 0.453125 1 1 v 3.925781 c 0 0.589844 -0.484375 1.074219 -1.074219 1.074219 h -3.917969 c -0.589843 0 -1.074218 -0.484375 -1.078124 -1.074219 v 0.035157 c 0.019531 -0.546876 0.488281 -0.980469 1.035156 -0.960938 h 0.035156 h 6 c 0.550781 0 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 h -6 h 0.035156 c -1.660156 -0.058594 -3.046875 1.230469 -3.105468 2.894531 v 0.035157 c 0.003906 1.703124 1.375 3.070312 3.078124 3.070312 h 3.917969 c 1.703125 0 3.074219 -1.371094 3.074219 -3.074219 v -3.925781 c 0 -1.664062 -1.335938 -3 -3 -3 h -5 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 z m 0 0"/></g></svg>
diff --git a/src/tiled/varianteditor.cpp b/src/tiled/varianteditor.cpp
index 93ec5f6934..abbd8bd2bb 100644
--- a/src/tiled/varianteditor.cpp
+++ b/src/tiled/varianteditor.cpp
@@ -37,6 +37,7 @@
 #include <QResizeEvent>
 #include <QSpacerItem>
 #include <QSpinBox>
+#include <QToolButton>
 
 namespace Tiled {
 
@@ -284,53 +285,78 @@ QWidget *ColorProperty::createEditor(QWidget *parent)
 QWidget *FontProperty::createEditor(QWidget *parent)
 {
     auto editor = new QWidget(parent);
-    auto layout = new QVBoxLayout(editor);
     auto fontComboBox = new QFontComboBox(editor);
+
     auto sizeSpinBox = new QSpinBox(editor);
-    auto boldCheckBox = new QCheckBox(tr("Bold"), editor);
-    auto italicCheckBox = new QCheckBox(tr("Italic"), editor);
-    auto underlineCheckBox = new QCheckBox(tr("Underline"), editor);
-    auto strikeoutCheckBox = new QCheckBox(tr("Strikeout"), editor);
-    auto kerningCheckBox = new QCheckBox(tr("Kerning"), editor);
     sizeSpinBox->setRange(1, 999);
     sizeSpinBox->setSuffix(tr(" px"));
     sizeSpinBox->setKeyboardTracking(false);
+
+    auto bold = new QToolButton(editor);
+    bold->setIcon(QIcon(QStringLiteral("://images/scalable/text-bold-symbolic.svg")));
+    bold->setToolTip(tr("Bold"));
+    bold->setCheckable(true);
+
+    auto italic = new QToolButton(editor);
+    italic->setIcon(QIcon(QStringLiteral("://images/scalable/text-italic-symbolic.svg")));
+    italic->setToolTip(tr("Italic"));
+    italic->setCheckable(true);
+
+    auto underline = new QToolButton(editor);
+    underline->setIcon(QIcon(QStringLiteral("://images/scalable/text-underline-symbolic.svg")));
+    underline->setToolTip(tr("Underline"));
+    underline->setCheckable(true);
+
+    auto strikeout = new QToolButton(editor);
+    strikeout->setIcon(QIcon(QStringLiteral("://images/scalable/text-strikethrough-symbolic.svg")));
+    strikeout->setToolTip(tr("Strikethrough"));
+    strikeout->setCheckable(true);
+
+    auto kerning = new QCheckBox(tr("Kerning"), editor);
+
+    auto layout = new QVBoxLayout(editor);
     layout->setContentsMargins(QMargins());
     layout->setSpacing(Utils::dpiScaled(3));
     layout->addWidget(fontComboBox);
     layout->addWidget(sizeSpinBox);
-    layout->addWidget(boldCheckBox);
-    layout->addWidget(italicCheckBox);
-    layout->addWidget(underlineCheckBox);
-    layout->addWidget(strikeoutCheckBox);
-    layout->addWidget(kerningCheckBox);
+
+    auto buttonsLayout = new QHBoxLayout;
+    buttonsLayout->setContentsMargins(QMargins());
+    buttonsLayout->addWidget(bold);
+    buttonsLayout->addWidget(italic);
+    buttonsLayout->addWidget(underline);
+    buttonsLayout->addWidget(strikeout);
+    buttonsLayout->addStretch();
+
+    layout->addLayout(buttonsLayout);
+    layout->addWidget(kerning);
 
     auto syncEditor = [=] {
         const auto font = value();
         const QSignalBlocker fontBlocker(fontComboBox);
         const QSignalBlocker sizeBlocker(sizeSpinBox);
-        const QSignalBlocker boldBlocker(boldCheckBox);
-        const QSignalBlocker italicBlocker(italicCheckBox);
-        const QSignalBlocker underlineBlocker(underlineCheckBox);
-        const QSignalBlocker strikeoutBlocker(strikeoutCheckBox);
-        const QSignalBlocker kerningBlocker(kerningCheckBox);
+        const QSignalBlocker boldBlocker(bold);
+        const QSignalBlocker italicBlocker(italic);
+        const QSignalBlocker underlineBlocker(underline);
+        const QSignalBlocker strikeoutBlocker(strikeout);
+        const QSignalBlocker kerningBlocker(kerning);
         fontComboBox->setCurrentFont(font);
         sizeSpinBox->setValue(font.pixelSize());
-        boldCheckBox->setChecked(font.bold());
-        italicCheckBox->setChecked(font.italic());
-        underlineCheckBox->setChecked(font.underline());
-        strikeoutCheckBox->setChecked(font.strikeOut());
-        kerningCheckBox->setChecked(font.kerning());
+        bold->setChecked(font.bold());
+        italic->setChecked(font.italic());
+        underline->setChecked(font.underline());
+        strikeout->setChecked(font.strikeOut());
+        kerning->setChecked(font.kerning());
     };
 
     auto syncProperty = [=] {
         auto font = fontComboBox->currentFont();
         font.setPixelSize(sizeSpinBox->value());
-        font.setBold(boldCheckBox->isChecked());
-        font.setItalic(italicCheckBox->isChecked());
-        font.setUnderline(underlineCheckBox->isChecked());
-        font.setStrikeOut(strikeoutCheckBox->isChecked());
-        font.setKerning(kerningCheckBox->isChecked());
+        font.setBold(bold->isChecked());
+        font.setItalic(italic->isChecked());
+        font.setUnderline(underline->isChecked());
+        font.setStrikeOut(strikeout->isChecked());
+        font.setKerning(kerning->isChecked());
         setValue(font);
     };
 
@@ -339,11 +365,11 @@ QWidget *FontProperty::createEditor(QWidget *parent)
     connect(this, &Property::valueChanged, fontComboBox, syncEditor);
     connect(fontComboBox, &QFontComboBox::currentFontChanged, this, syncProperty);
     connect(sizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, syncProperty);
-    connect(boldCheckBox, &QCheckBox::toggled, this, syncProperty);
-    connect(italicCheckBox, &QCheckBox::toggled, this, syncProperty);
-    connect(underlineCheckBox, &QCheckBox::toggled, this, syncProperty);
-    connect(strikeoutCheckBox, &QCheckBox::toggled, this, syncProperty);
-    connect(kerningCheckBox, &QCheckBox::toggled, this, syncProperty);
+    connect(bold, &QAbstractButton::toggled, this, syncProperty);
+    connect(italic, &QAbstractButton::toggled, this, syncProperty);
+    connect(underline, &QAbstractButton::toggled, this, syncProperty);
+    connect(strikeout, &QAbstractButton::toggled, this, syncProperty);
+    connect(kerning, &QAbstractButton::toggled, this, syncProperty);
 
     return editor;
 }