diff --git a/app/ui/icons/icons.cpp b/app/ui/icons/icons.cpp
index 5c16000a5..cc79d834a 100644
--- a/app/ui/icons/icons.cpp
+++ b/app/ui/icons/icons.cpp
@@ -55,6 +55,7 @@ QIcon icon::ToolSlip;
 QIcon icon::ToolSlide;
 QIcon icon::ToolHand;
 QIcon icon::ToolTransition;
+QIcon icon::ToolTrackSelect;
 QIcon icon::Folder;
 QIcon icon::Sequence;
 QIcon icon::Video;
@@ -68,6 +69,8 @@ QIcon icon::TriRight;
 QIcon icon::TextBold;
 QIcon icon::TextItalic;
 QIcon icon::TextUnderline;
+QIcon icon::TextStrikethrough;
+QIcon icon::TextSmallCaps;
 QIcon icon::TextAlignLeft;
 QIcon icon::TextAlignRight;
 QIcon icon::TextAlignCenter;
@@ -116,6 +119,7 @@ void icon::LoadAll(const QString& theme)
   ToolSlide = Create(theme, "slide");
   ToolHand = Create(theme, "hand");
   ToolTransition = Create(theme, "transition-tool");
+  ToolTrackSelect = Create(theme, "track-tool");
 
   Folder = Create(theme, "folder");
   Sequence = Create(theme, "sequence");
@@ -133,6 +137,8 @@ void icon::LoadAll(const QString& theme)
   TextBold = Create(theme, "text-bold");
   TextItalic = Create(theme, "text-italic");
   TextUnderline = Create(theme, "text-underline");
+  TextStrikethrough = Create(theme, "text-strikethrough");
+  TextSmallCaps = Create(theme, "text-small-caps");
   TextAlignLeft = Create(theme, "align-left");
   TextAlignRight = Create(theme, "align-right");
   TextAlignCenter = Create(theme, "align-center");
diff --git a/app/ui/icons/icons.h b/app/ui/icons/icons.h
index c3e330685..987ab2b3b 100644
--- a/app/ui/icons/icons.h
+++ b/app/ui/icons/icons.h
@@ -57,6 +57,7 @@ extern QIcon ToolSlip;
 extern QIcon ToolSlide;
 extern QIcon ToolHand;
 extern QIcon ToolTransition;
+extern QIcon ToolTrackSelect;
 
 // Project Icons
 extern QIcon Folder;
@@ -78,6 +79,8 @@ extern QIcon TriRight;
 extern QIcon TextBold;
 extern QIcon TextItalic;
 extern QIcon TextUnderline;
+extern QIcon TextStrikethrough;
+extern QIcon TextSmallCaps;
 extern QIcon TextAlignLeft;
 extern QIcon TextAlignRight;
 extern QIcon TextAlignCenter;
diff --git a/app/widget/toolbar/toolbar.cpp b/app/widget/toolbar/toolbar.cpp
index dd30d4372..ddce86c7a 100644
--- a/app/widget/toolbar/toolbar.cpp
+++ b/app/widget/toolbar/toolbar.cpp
@@ -126,7 +126,7 @@ void Toolbar::Retranslate()
 void Toolbar::UpdateIcons()
 {
   btn_pointer_tool_->setIcon(icon::ToolPointer);
-  btn_trackselect_tool_->setIcon(icon::TriRight); // FIXME: Procure real icon
+  btn_trackselect_tool_->setIcon(icon::ToolTrackSelect);
   btn_edit_tool_->setIcon(icon::ToolEdit);
   btn_ripple_tool_->setIcon(icon::ToolRipple);
   btn_rolling_tool_->setIcon(icon::ToolRolling);
diff --git a/app/widget/viewer/viewertexteditor.cpp b/app/widget/viewer/viewertexteditor.cpp
index a3480a67c..cdcc769ee 100644
--- a/app/widget/viewer/viewertexteditor.cpp
+++ b/app/widget/viewer/viewertexteditor.cpp
@@ -359,7 +359,7 @@ ViewerTextEditorToolBar::ViewerTextEditorToolBar(QWidget *parent) :
   strikethrough_btn_ = new QPushButton();
   connect(strikethrough_btn_, &QPushButton::clicked, this, &ViewerTextEditorToolBar::StrikethroughChanged);
   strikethrough_btn_->setCheckable(true);
-  strikethrough_btn_->setText(tr("S")); // FIXME: Source icon
+  strikethrough_btn_->setIcon(icon::TextStrikethrough);
   basic_layout->addWidget(strikethrough_btn_);
 
   basic_layout->addWidget(QtUtils::CreateVerticalLine());
@@ -441,7 +441,8 @@ ViewerTextEditorToolBar::ViewerTextEditorToolBar(QWidget *parent) :
   connect(line_height_slider_, &FloatSlider::ValueChanged, this, &ViewerTextEditorToolBar::LineHeightChanged);
   advanced_layout->addWidget(line_height_slider_);
 
-  small_caps_btn_ = new QPushButton(tr("Small Caps")); // FIXME: Procure icon
+  small_caps_btn_ = new QPushButton();
+  small_caps_btn_->setIcon(icon::TextSmallCaps);
   small_caps_btn_->setCheckable(true);
   connect(small_caps_btn_, &QPushButton::clicked, this, &ViewerTextEditorToolBar::SmallCapsChanged);
   advanced_layout->addWidget(small_caps_btn_);