ui: integrate previously merged icons

app/ui/icons/icons.cpp

@@ -96,6 +96,7 @@ QIcon icon::LockOpened;
 QIcon icon::LockClosed;
 QIcon icon::Pencil;
 QIcon icon::Subtitles;
+QIcon icon::ColorPicker;
 
 void icon::LoadAll(const QString& theme)
 {
@@ -148,9 +149,9 @@ void icon::LoadAll(const QString& theme)
   TextAlignRight = Create(theme, "align-right");
   TextAlignCenter = Create(theme, "align-center");
   TextAlignJustify = Create(theme, "align-justify-all");
-  TextAlignTop = Create(theme, "align-left");
-  TextAlignBottom = Create(theme, "align-right");
-  TextAlignMiddle = Create(theme, "align-center");
+  TextAlignTop = Create(theme, "align-v-top");
+  TextAlignBottom = Create(theme, "align-v-bottom");
+  TextAlignMiddle = Create(theme, "align-v-middle");
 
   Snapping = Create(theme, "magnet");
   ZoomIn = Create(theme, "zoomin");
@@ -164,6 +165,7 @@ void icon::LoadAll(const QString& theme)
   Plus = Create(theme, "plus");
   Minus = Create(theme, "minus");
   AddEffect = Create(theme, "add-effect");
+  ColorPicker = Create(theme, "color-picker");
 
   EyeOpened = Create(theme, "eye-opened");
   EyeClosed = Create(theme, "eye-closed");

app/ui/icons/icons.h

@@ -108,6 +108,7 @@ extern QIcon LockOpened;
 extern QIcon LockClosed;
 extern QIcon Pencil;
 extern QIcon Subtitles;
+extern QIcon ColorPicker;
 
 /**
  * @brief Create an icon object loaded from file

app/widget/colorwheel/colorvalueswidget.cpp

@@ -26,6 +26,7 @@
 
 #include "config/config.h"
 #include "core.h"
+#include "ui/icons/icons.h"
 
 namespace olive {
 
@@ -51,7 +52,9 @@ ColorValuesWidget::ColorValuesWidget(ColorManager *manager, QWidget *parent) :
     preview_->setFixedHeight(fontMetrics().height() * 3 / 2);
     preview_layout->addWidget(preview_);
 
-    color_picker_btn_ = new QPushButton(tr("Pick"));
+    color_picker_btn_ = new QPushButton();
+    color_picker_btn_->setIcon(icon::ColorPicker);
+    color_picker_btn_->setFixedWidth(color_picker_btn_->sizeHint().height());
     color_picker_btn_->setCheckable(true);
     connect(color_picker_btn_, &QPushButton::toggled, this, &ColorValuesWidget::ColorPickedBtnToggled);
     connect(Core::instance(), &Core::ColorPickerColorEmitted, this, &ColorValuesWidget::SetReferenceColor);