diff --git a/src/UI/MainWindow.cc b/src/UI/MainWindow.cc
index 66169d379587d3efa51b222d14925a0abebc9ad3..08eb9cddaa48aa65326abbc40fbc56ba4382c26c 100644
--- a/src/UI/MainWindow.cc
+++ b/src/UI/MainWindow.cc
@@ -39,7 +39,7 @@
 using namespace Vivy;
 
 MainWindow::MainWindow() noexcept
-    : Window(QIcon(":icons/vivy.png"), "Vivy")
+    : Window(QIcon(VIVY_ICON_APP), "Vivy")
 {
     /* Some declarations */
     DCL_MENU(file, "&File");
diff --git a/src/UI/TitleBar.cc b/src/UI/TitleBar.cc
index 15d936b8c242793f22d51b7d84be8faf795ac6a7..0142aa5a544765bc8fdb23c0908dd72e9f9875fd 100644
--- a/src/UI/TitleBar.cc
+++ b/src/UI/TitleBar.cc
@@ -19,7 +19,7 @@ TitleBar::TitleBar(const QIcon &icon, const QString &title, QWidget *parent) noe
 
     auto *iconLabel   = new QLabel(this);                           // Index 0
     titleLabel        = new QLabel("<h2>" + title + "</h2>", this); // Index 1
-    auto *closeButton = new QPushButton(parent == nullptr ? "Quit" : "Close", this);
+    auto *closeButton = new QPushButton(this);
 
     connect(closeButton, &QAbstractButton::clicked, this,
             [=, this]() noexcept -> void { emit closed(); });
@@ -30,15 +30,9 @@ TitleBar::TitleBar(const QIcon &icon, const QString &title, QWidget *parent) noe
     closeButton->setFlat(true);
     closeButton->setDefault(false);
     closeButton->setStyleSheet("color:          #1394B4;"
-                               "font-size:      14px;"
-                               "border-color:   #1394B4;"
-                               "border-width:   1px;"
-                               "border-radius:  2px;"
-                               "padding-top:    2px;"
-                               "padding-bottom: 2px;"
-                               "padding-left:   5px;"
-                               "padding-right:  5px;"
-                               "border-style:   solid;");
+                               "border:         none;"
+                               "icon:           url(" VIVY_ICON_CLOSE ");"
+                               "icon-size:      22px;");
 
     titleLayout->addWidget(iconLabel);
     titleLayout->addWidget(titleLabel);
diff --git a/src/UI/VivyDocumentView.cc b/src/UI/VivyDocumentView.cc
index d8af3d93b9cb0e32374f1f788c95411748153106..bd03841a56cf13b8cf9a41cda4ae826d0955d1d4 100644
--- a/src/UI/VivyDocumentView.cc
+++ b/src/UI/VivyDocumentView.cc
@@ -145,7 +145,7 @@ VivyDocumentView::closeDocument() noexcept
 QIcon
 VivyDocumentView::getDocumentTabIcon() const noexcept
 {
-    return QIcon(":/icons/vivy.png");
+    return QIcon(VIVY_ICON_APP);
 }
 
 void