diff --git a/client/config.h b/client/config.h
index 2e0c017..875bf39 100644
--- a/client/config.h
+++ b/client/config.h
@@ -42,14 +42,17 @@
 #define APP_VERSION_SUFFIX 3
 
 //#ifdef TARGET_OSX
-#define TRAY_START_ICON_NAME    ":/icons/icons/starttracking-osx.png"
-#define TRAY_STOP_ICON_NAME     ":/icons/icons/stoptracking-osx.png"
+#define ICONS                   ":/assets/images"
+#define ICONS_BUTTONS           ":/assets/images/buttons"
+#define NAMED_BUTTON(X)         QIcon(":/assets/images/buttons/" #X)
+#define TRAY_START_ICON_NAME    ":/assets/images/buttons/starttracking-osx.png"
+#define TRAY_STOP_ICON_NAME     ":/assets/images/buttons/stoptracking-osx.png"
 
-#define TRAY_DEFAULT_ICON_NAME  ":/icons/icons/tray-default.png"
-#define TRAY_RUNNING_ICON_NAME  ":/icons/icons/tray-running.png"
+#define TRAY_DEFAULT_ICON_NAME  ":/assets/images/buttons/tray-default.png"
+#define TRAY_RUNNING_ICON_NAME  ":/assets/images/buttons/tray-running.png"
 
-#define ACTION_START_ICON_NAME  ":/icons/icons/clock-32x32.png"
-#define ACTION_STOP_ICON_NAME   ":/icons/icons/process-stop.png"
+#define ACTION_START_ICON_NAME  ":/assets/images/buttons/clock-32x32.png"
+#define ACTION_STOP_ICON_NAME   ":/assets/images/buttons/process-stop.png"
 //#endif
 
 #ifndef USE_ENCRYPTED_DB
diff --git a/client/helper.cpp b/client/helper.cpp
index 9a8c213..28f36f5 100644
--- a/client/helper.cpp
+++ b/client/helper.cpp
@@ -34,10 +34,12 @@ namespace helper {
 
 void theme::applyCurrent(Settings& settings)
 {
+    return;
+
     // Dark theme
     if (settings.data()[KEY_DARK_THEME].toBool())
     {
-        QFile f(":qdarkstyle/style.qss");
+        QFile f(":/assets/qdarkstyle/style.qss");
         if (f.exists())
         {
             f.open(QFile::ReadOnly | QFile::Text);
diff --git a/client/main.cpp b/client/main.cpp
index 630f3e5..016a60b 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -13,7 +13,6 @@ int main(int argc, char *argv[])
     helper::theme::applyCurrent(Settings::instance());
 
     QFont f = app.font();
-    // f.setFamily("Monaco");
     f.setPointSize(14);
     app.setFont(f);
     app.setApplicationName(APPNAME);
diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index 615f1a7..e928896 100644
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -38,6 +38,7 @@
 #endif
 
 #include <QDesktopWidget>
+#include <QDebug>
 #include <iostream>
 
 #define SETTINGS mSettings->data()
@@ -218,7 +219,7 @@ void MainWindow::initClient()
         ui->mMainToolbar->addWidget(spacerWidget);
 
         mAttachmentsAction = new QAction(this);
-        mAttachmentsAction->setIcon(QIcon(":/icons/icons/mail-attachment.png"));
+        mAttachmentsAction->setIcon(NAMED_BUTTON("mail-attachment.png"));
         mAttachmentsAction->setText(tr("Attachments"));
         //ui->mMainToolbar->addAction(mAttachmentsAction);
         connect(mAttachmentsAction, SIGNAL(triggered()), this, SLOT(showAttachments()));
@@ -850,7 +851,7 @@ void MainWindow::buildOpenOrCreateView()
 
 QIcon MainWindow::getAppIcon()
 {
-    QIcon app_icon(QPixmap(QString(":/icons/icons/noo_128x128.png")));
+    QIcon app_icon(QPixmap(QString(":/assets/images/app_icon/linux/noo_128x128.png")));
 
     return app_icon;
 }
@@ -1209,7 +1210,7 @@ void MainWindow::trayContextualMenu()
     QMenu* menu = new QMenu();
     menu->addAction(ui->mStartOrStopTrackingAction);
     QMenu* recentMenu = menu->addMenu(ui->mStartRecentTaskMenu->title());
-    recentMenu->setIcon(QIcon(":/icons/icons/empty.png"));
+    recentMenu->setIcon(NAMED_BUTTON("empty.png"));
     prepareRecentTasksMenu(recentMenu);
     menu->addAction(ui->mShowLittAction);
     //menu->addAction(ui->mPreferencesAction);
@@ -1275,7 +1276,7 @@ void MainWindow::installDockMenu()
     QMenu* menu = new QMenu();
     menu->addAction(ui->mStartOrStopTrackingAction);
     mDockRecentMenu = menu->addMenu(ui->mStartRecentTaskMenu->title());
-    mDockRecentMenu->setIcon(QIcon(":/icons/icons/empty.png"));
+    mDockRecentMenu->setIcon(NAMED_ICON("empty.png"));
     prepareRecentTasksMenu(mDockRecentMenu);
 
     qt_mac_set_dock_menu(menu);
@@ -1707,15 +1708,3 @@ void MainWindow::showFatal(const QString& message)
     std::cerr << message.toStdString() << std::endl;
     exit(EXIT_FAILURE);
 }
-
-void MainWindow::onIncreaseFontSize()
-{
-    QFont f = QApplication::font("QWidget");
-    f.setPixelSize(f.pixelSize() + 1);
-    QApplication::setFont(f, "QWidget");
-}
-
-void MainWindow::onDecreaseFontSize()
-{
-
-}
diff --git a/client/mainwindow.h b/client/mainwindow.h
index 6aad7d4..dcb7926 100644
--- a/client/mainwindow.h
+++ b/client/mainwindow.h
@@ -190,7 +190,7 @@ public slots:
     void startTracking();
     void startTrackingRecent();
 
-    void stopTracking(TrackingStopReason reason, time_t current_utc = time(nullptr));
+    void stopTracking(MainWindow::TrackingStopReason reason, time_t current_utc = time(nullptr));
     void updateData();
     void add10Mins();
 
@@ -239,9 +239,6 @@ public slots:
     void onDbPasswordCancelled();
     void onNewDbPasswordEntered(const QString& password);
     void onDatabaseChanged(const QString& path);
-
-    void onIncreaseFontSize();
-    void onDecreaseFontSize();
 };
 
 #endif // MAINWINDOW_H
diff --git a/client/mainwindow.qrc b/client/mainwindow.qrc
index d70e022..83255f6 100644
--- a/client/mainwindow.qrc
+++ b/client/mainwindow.qrc
@@ -1,64 +1,65 @@
 <RCC>
-    <qresource prefix="/MainWindow"/>
-    <qresource prefix="/icons">
-        <file>icons/document-new.png</file>
-        <file>icons/document-print.png</file>
-        <file>icons/document-save.png</file>
-        <file>icons/edit-clear.png</file>
-        <file>icons/edit-copy.png</file>
-        <file>icons/edit-cut.png</file>
-        <file>icons/edit-delete.png</file>
-        <file>icons/edit-find.png</file>
-        <file>icons/edit-find-replace.png</file>
-        <file>icons/edit-paste.png</file>
-        <file>icons/edit-redo.png</file>
-        <file>icons/edit-select-all.png</file>
-        <file>icons/edit-undo.png</file>
-        <file>icons/folder.png</file>
-        <file>icons/folder-new.png</file>
-        <file>icons/folder-open.png</file>
-        <file>icons/format-indent-less.png</file>
-        <file>icons/format-indent-more.png</file>
-        <file>icons/format-justify-center.png</file>
-        <file>icons/format-justify-fill.png</file>
-        <file>icons/format-justify-left.png</file>
-        <file>icons/format-justify-right.png</file>
-        <file>icons/format-text-bold.png</file>
-        <file>icons/format-text-italic.png</file>
-        <file>icons/format-text-strikethrough.png</file>
-        <file>icons/format-text-underline.png</file>
-        <file>icons/list-add.png</file>
-        <file>icons/list-remove.png</file>
-        <file>icons/media-playback-start.png</file>
-        <file>icons/media-playback-stop.png</file>
-        <file>icons/network-error.png</file>
-        <file>icons/network-receive.png</file>
-        <file>icons/network-transmit.png</file>
-        <file>icons/software-update-available.png</file>
-        <file>icons/text-x-generic.png</file>
-        <file>icons/empty.png</file>
-        <file>icons/starttracking-osx.png</file>
-        <file>icons/stoptracking-osx.png</file>
-        <file>icons/mail-attachment.png</file>
-        <file>icons/appointment-new.png</file>
-        <file>icons/accessories-calculator.png</file>
-        <file>icons/office-calendar.png</file>
-        <file>icons/tray-default.png</file>
-        <file>icons/tray-running.png</file>
-        <file>icons/folder-saved-search.png</file>
-        <file>icons/applications-development.png</file>
-        <file>icons/dialog-error.png</file>
-        <file>icons/emblem-system.png</file>
-        <file>icons/preferences-system.png</file>
-        <file>icons/process-stop.png</file>
-        <file>icons/system-search.png</file>
-        <file>icons/tree-add-child-small.png</file>
-        <file>icons/tree-add-child.png</file>
-        <file>icons/tree-add-root-small.png</file>
-        <file>icons/tree-add-root.png</file>
-        <file>icons/clock-32x32.png</file>
-        <file>icons/tree-add-sibling-small.png</file>
-        <file>icons/app/noo_128x128.png</file>
-        <file>icons/noo_128x128.png</file>
+    <qresource prefix="/">
+        <file>assets/images/buttons/accessories-calculator.png</file>
+        <file>assets/images/buttons/applications-development.png</file>
+        <file>assets/images/buttons/appointment-new.png</file>
+        <file>assets/images/buttons/clock-32x32.png</file>
+        <file>assets/images/buttons/clock-64x64.png</file>
+        <file>assets/images/buttons/clock-128x128.png</file>
+        <file>assets/images/buttons/dialog-error.png</file>
+        <file>assets/images/buttons/document-new.png</file>
+        <file>assets/images/buttons/document-print.png</file>
+        <file>assets/images/buttons/document-save.png</file>
+        <file>assets/images/buttons/edit-clear.png</file>
+        <file>assets/images/buttons/edit-copy.png</file>
+        <file>assets/images/buttons/edit-cut.png</file>
+        <file>assets/images/buttons/edit-delete.png</file>
+        <file>assets/images/buttons/edit-find-replace.png</file>
+        <file>assets/images/buttons/edit-find.png</file>
+        <file>assets/images/buttons/edit-paste.png</file>
+        <file>assets/images/buttons/edit-redo.png</file>
+        <file>assets/images/buttons/edit-select-all.png</file>
+        <file>assets/images/buttons/edit-undo.png</file>
+        <file>assets/images/buttons/emblem-system.png</file>
+        <file>assets/images/buttons/empty.png</file>
+        <file>assets/images/buttons/folder-new.png</file>
+        <file>assets/images/buttons/folder-open.png</file>
+        <file>assets/images/buttons/folder-saved-search.png</file>
+        <file>assets/images/buttons/folder.png</file>
+        <file>assets/images/buttons/format-indent-less.png</file>
+        <file>assets/images/buttons/format-indent-more.png</file>
+        <file>assets/images/buttons/format-justify-center.png</file>
+        <file>assets/images/buttons/format-justify-fill.png</file>
+        <file>assets/images/buttons/format-justify-left.png</file>
+        <file>assets/images/buttons/format-justify-right.png</file>
+        <file>assets/images/buttons/format-text-bold.png</file>
+        <file>assets/images/buttons/format-text-italic.png</file>
+        <file>assets/images/buttons/format-text-strikethrough.png</file>
+        <file>assets/images/buttons/format-text-underline.png</file>
+        <file>assets/images/buttons/list-add.png</file>
+        <file>assets/images/buttons/list-remove.png</file>
+        <file>assets/images/buttons/mail-attachment.png</file>
+        <file>assets/images/buttons/media-playback-start.png</file>
+        <file>assets/images/buttons/media-playback-stop.png</file>
+        <file>assets/images/buttons/network-error.png</file>
+        <file>assets/images/buttons/network-receive.png</file>
+        <file>assets/images/buttons/network-transmit.png</file>
+        <file>assets/images/buttons/office-calendar.png</file>
+        <file>assets/images/buttons/preferences-system.png</file>
+        <file>assets/images/buttons/process-stop.png</file>
+        <file>assets/images/buttons/software-update-available.png</file>
+        <file>assets/images/buttons/starttracking-osx.png</file>
+        <file>assets/images/buttons/stoptracking-osx.png</file>
+        <file>assets/images/buttons/system-search.png</file>
+        <file>assets/images/buttons/text-x-generic.png</file>
+        <file>assets/images/buttons/tray-default.png</file>
+        <file>assets/images/buttons/tray-running.png</file>
+        <file>assets/images/buttons/tree-add-child-small.png</file>
+        <file>assets/images/buttons/tree-add-child.png</file>
+        <file>assets/images/buttons/tree-add-root-small.png</file>
+        <file>assets/images/buttons/tree-add-root.png</file>
+        <file>assets/images/buttons/tree-add-sibling-small.png</file>
+        <file>assets/images/app_icon/linux/noo_128x128.png</file>
+        <file>assets/misc/noo.desktop</file>
     </qresource>
 </RCC>
diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index 808f0ba..f04a371 100644
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -327,7 +327,7 @@
      </property>
      <property name="icon">
       <iconset resource="mainwindow.qrc">
-       <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+       <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
      </property>
     </widget>
     <addaction name="mActionSearchInTasks"/>
@@ -381,7 +381,7 @@
    </property>
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/network-receive.png</normaloff>:/icons/icons/network-receive.png</iconset>
+     <normaloff>:/assets/images/buttons/network-receive.png</normaloff>:/assets/images/buttons/network-receive.png</iconset>
    </property>
    <property name="text">
     <string>S&amp;ync...</string>
@@ -393,7 +393,7 @@
   <action name="mPrintAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/document-print.png</normaloff>:/icons/icons/document-print.png</iconset>
+     <normaloff>:/assets/images/buttons/document-print.png</normaloff>:/assets/images/buttons/document-print.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Print...</string>
@@ -412,7 +412,7 @@
   <action name="mSaveAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/document-save.png</normaloff>:/icons/icons/document-save.png</iconset>
+     <normaloff>:/assets/images/buttons/document-save.png</normaloff>:/assets/images/buttons/document-save.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Save</string>
@@ -424,7 +424,7 @@
   <action name="mDeleteTaskAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/list-remove.png</normaloff>:/icons/icons/list-remove.png</iconset>
+     <normaloff>:/assets/images/buttons/list-remove.png</normaloff>:/assets/images/buttons/list-remove.png</iconset>
    </property>
    <property name="text">
     <string>Delete task</string>
@@ -436,7 +436,7 @@
   <action name="mRenameTaskAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Rename task</string>
@@ -445,7 +445,7 @@
   <action name="mNewTaskAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/tree-add-child-small.png</normaloff>:/icons/icons/tree-add-child-small.png</iconset>
+     <normaloff>:/assets/images/buttons/tree-add-child-small.png</normaloff>:/assets/images/buttons/tree-add-child-small.png</iconset>
    </property>
    <property name="text">
     <string>New child task</string>
@@ -463,7 +463,7 @@
   <action name="mNewRootTaskAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/tree-add-root-small.png</normaloff>:/icons/icons/tree-add-root-small.png</iconset>
+     <normaloff>:/assets/images/buttons/tree-add-root-small.png</normaloff>:/assets/images/buttons/tree-add-root-small.png</iconset>
    </property>
    <property name="text">
     <string>New root task</string>
@@ -475,7 +475,7 @@
   <action name="mStartOrStopTrackingAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/clock-32x32.png</normaloff>:/icons/icons/clock-32x32.png</iconset>
+     <normaloff>:/assets/images/buttons/clock-32x32.png</normaloff>:/assets/images/buttons/clock-32x32.png</iconset>
    </property>
    <property name="text">
     <string>Start tracking</string>
@@ -487,7 +487,7 @@
   <action name="mUndoEditAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/edit-undo.png</normaloff>:/icons/icons/edit-undo.png</iconset>
+     <normaloff>:/assets/images/buttons/edit-undo.png</normaloff>:/assets/images/buttons/edit-undo.png</iconset>
    </property>
    <property name="text">
     <string>Undo</string>
@@ -499,7 +499,7 @@
   <action name="mRedoEditAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/edit-redo.png</normaloff>:/icons/icons/edit-redo.png</iconset>
+     <normaloff>:/assets/images/buttons/edit-redo.png</normaloff>:/assets/images/buttons/edit-redo.png</iconset>
    </property>
    <property name="text">
     <string>Redo</string>
@@ -511,7 +511,7 @@
   <action name="mCutEditAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/edit-cut.png</normaloff>:/icons/icons/edit-cut.png</iconset>
+     <normaloff>:/assets/images/buttons/edit-cut.png</normaloff>:/assets/images/buttons/edit-cut.png</iconset>
    </property>
    <property name="text">
     <string>Cut</string>
@@ -523,7 +523,7 @@
   <action name="mCopyEditAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/edit-copy.png</normaloff>:/icons/icons/edit-copy.png</iconset>
+     <normaloff>:/assets/images/buttons/edit-copy.png</normaloff>:/assets/images/buttons/edit-copy.png</iconset>
    </property>
    <property name="text">
     <string>Copy</string>
@@ -535,7 +535,7 @@
   <action name="mPasteEditAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/edit-paste.png</normaloff>:/icons/icons/edit-paste.png</iconset>
+     <normaloff>:/assets/images/buttons/edit-paste.png</normaloff>:/assets/images/buttons/edit-paste.png</iconset>
    </property>
    <property name="text">
     <string>Paste</string>
@@ -547,7 +547,7 @@
   <action name="mDeleteEditAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/edit-clear.png</normaloff>:/icons/icons/edit-clear.png</iconset>
+     <normaloff>:/assets/images/buttons/edit-clear.png</normaloff>:/assets/images/buttons/edit-clear.png</iconset>
    </property>
    <property name="text">
     <string>Delete</string>
@@ -556,7 +556,7 @@
   <action name="mSelectAllEditAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/edit-select-all.png</normaloff>:/icons/icons/edit-select-all.png</iconset>
+     <normaloff>:/assets/images/buttons/edit-select-all.png</normaloff>:/assets/images/buttons/edit-select-all.png</iconset>
    </property>
    <property name="text">
     <string>Select all note</string>
@@ -573,7 +573,7 @@
   <action name="mTimelineAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/office-calendar.png</normaloff>:/icons/icons/office-calendar.png</iconset>
+     <normaloff>:/assets/images/buttons/office-calendar.png</normaloff>:/assets/images/buttons/office-calendar.png</iconset>
    </property>
    <property name="text">
     <string>Timeline...</string>
@@ -582,7 +582,7 @@
   <action name="mTimeReportAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/appointment-new.png</normaloff>:/icons/icons/appointment-new.png</iconset>
+     <normaloff>:/assets/images/buttons/appointment-new.png</normaloff>:/assets/images/buttons/appointment-new.png</iconset>
    </property>
    <property name="text">
     <string>Time report...</string>
@@ -597,7 +597,7 @@
    </property>
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Show toolbar</string>
@@ -606,7 +606,7 @@
   <action name="mAttachmentsAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Attachments</string>
@@ -626,7 +626,7 @@
    </property>
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/accessories-calculator.png</normaloff>:/icons/icons/accessories-calculator.png</iconset>
+     <normaloff>:/assets/images/buttons/accessories-calculator.png</normaloff>:/assets/images/buttons/accessories-calculator.png</iconset>
    </property>
    <property name="text">
     <string>Time trackable</string>
@@ -635,7 +635,7 @@
   <action name="mActionSearchInTasks">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/folder-saved-search.png</normaloff>:/icons/icons/folder-saved-search.png</iconset>
+     <normaloff>:/assets/images/buttons/folder-saved-search.png</normaloff>:/assets/images/buttons/folder-saved-search.png</iconset>
    </property>
    <property name="text">
     <string>Find in tasks...</string>
@@ -647,7 +647,7 @@
   <action name="mActionSearch">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/edit-find.png</normaloff>:/icons/icons/edit-find.png</iconset>
+     <normaloff>:/assets/images/buttons/edit-find.png</normaloff>:/assets/images/buttons/edit-find.png</iconset>
    </property>
    <property name="text">
     <string>Find...</string>
@@ -659,7 +659,7 @@
   <action name="mShowLittAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/format-justify-fill.png</normaloff>:/icons/icons/format-justify-fill.png</iconset>
+     <normaloff>:/assets/images/buttons/format-justify-fill.png</normaloff>:/assets/images/buttons/format-justify-fill.png</iconset>
    </property>
    <property name="text">
     <string>Show Litt window</string>
@@ -671,7 +671,7 @@
   <action name="mFocusTaskTreeAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Switch to task tree</string>
@@ -683,7 +683,7 @@
   <action name="mFocusTaskTextAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Switch to task text</string>
@@ -695,7 +695,7 @@
   <action name="mAddSiblingAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/tree-add-sibling-small.png</normaloff>:/icons/icons/tree-add-sibling-small.png</iconset>
+     <normaloff>:/assets/images/buttons/tree-add-sibling-small.png</normaloff>:/assets/images/buttons/tree-add-sibling-small.png</iconset>
    </property>
    <property name="text">
     <string>Add sibling</string>
@@ -707,7 +707,7 @@
   <action name="mDecreaseLevelAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Decrease level</string>
@@ -719,7 +719,7 @@
   <action name="mIncreaseLevelAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Increase level</string>
@@ -731,7 +731,7 @@
   <action name="mMoveUpAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Move up</string>
@@ -746,7 +746,7 @@
   <action name="mMoveDownAction">
    <property name="icon">
     <iconset resource="mainwindow.qrc">
-     <normaloff>:/icons/icons/empty.png</normaloff>:/icons/icons/empty.png</iconset>
+     <normaloff>:/assets/images/buttons/empty.png</normaloff>:/assets/images/buttons/empty.png</iconset>
    </property>
    <property name="text">
     <string>Move down</string>
@@ -758,28 +758,6 @@
     <string>Ctrl+Shift+Down</string>
    </property>
   </action>
-  <action name="mIncreaseFontSizeAction">
-   <property name="text">
-    <string>Increase font size</string>
-   </property>
-   <property name="toolTip">
-    <string>Increase font size</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+=</string>
-   </property>
-  </action>
-  <action name="mDecreaseFontSize">
-   <property name="text">
-    <string>Decrease font size</string>
-   </property>
-   <property name="toolTip">
-    <string>Decrease font size</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+-</string>
-   </property>
-  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -1342,38 +1320,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>mIncreaseFontSizeAction</sender>
-   <signal>triggered()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>onIncreaseFontSize()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>602</x>
-     <y>314</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>mDecreaseFontSize</sender>
-   <signal>triggered()</signal>
-   <receiver>MainWindow</receiver>
-   <slot>onDecreaseFontSize()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>602</x>
-     <y>314</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
  <slots>
   <slot>save()</slot>
@@ -1412,7 +1358,5 @@
   <slot>newSibling()</slot>
   <slot>moveUp()</slot>
   <slot>moveDown()</slot>
-  <slot>onIncreaseFontSize()</slot>
-  <slot>onDecreaseFontSize()</slot>
  </slots>
 </ui>
diff --git a/client/noo.pro b/client/noo.pro
index 2ce10df..b0992e4 100644
--- a/client/noo.pro
+++ b/client/noo.pro
@@ -163,7 +163,7 @@ FORMS    += mainwindow.ui       \
     openorcreatedb_widget.ui    \
     connectdb_widget.ui
 
-RESOURCES = mainwindow.qrc resources/qdarkstyle/dark/style.qrc
+RESOURCES = mainwindow.qrc assets/qdarkstyle/dark/style.qrc
 
 macx {
     OBJECTIVE_SOURCES +=                        \
diff --git a/client/platforms/linux/autostart.cpp b/client/platforms/linux/autostart.cpp
index 11c4e42..b59c359 100644
--- a/client/platforms/linux/autostart.cpp
+++ b/client/platforms/linux/autostart.cpp
@@ -16,11 +16,11 @@
 
 namespace fs = std::filesystem;
 
-#define QBREAK_DESKTOP_NAME "qbreak.desktop"
+#define NOO_DESKTOP_NAME "noo.desktop"
 
 static std::string read_desktop_file()
 {
-    QFile f(":/assets/misc/qbreak.desktop");
+    QFile f(":/assets/misc/noo.desktop");
     f.open(QFile::ReadOnly);
     auto bytes = f.readAll();
     return bytes.toStdString();
@@ -59,7 +59,7 @@ static fs::path autostart_dir()
 
 static fs::path autostart_path()
 {
-    return autostart_dir() / QBREAK_DESKTOP_NAME;
+    return autostart_dir() / NOO_DESKTOP_NAME;
 }
 
 void autostart::enable(const std::string& path_to_me)
@@ -99,7 +99,7 @@ static fs::path appmenu_install_dir()
 void appmenu::install(const std::string& path_to_me)
 {
     // Put .desktop file to ~/.config/autostart
-    std::ofstream ofs(appmenu_install_dir() / QBREAK_DESKTOP_NAME);
+    std::ofstream ofs(appmenu_install_dir() / NOO_DESKTOP_NAME);
     if (ofs.is_open())
     {
         ofs << fixup_desktop_file(read_desktop_file(), path_to_me);
@@ -119,8 +119,8 @@ void appmenu::install(const std::string& path_to_me)
             // Copy icons from resources
             for (auto& icon_suffix: icons)
             {
-                QString icon_src = QString(":/assets/images/coffee_cup/icon_") + icon_suffix + ".png",
-                        icon_dst = target_dir + "/" + icon_suffix + "/apps/qbreak.png";
+                QString icon_src = QString(":/assets/images/app_icon/icon_") + icon_suffix + ".png",
+                        icon_dst = target_dir + "/" + icon_suffix + "/apps/noo.png";
                 QFile::copy(icon_src, icon_dst);
             }
         }
@@ -130,11 +130,11 @@ void appmenu::install(const std::string& path_to_me)
 void appmenu::uninstall()
 {
     if (is_installed())
-        fs::remove(appmenu_install_dir() / QBREAK_DESKTOP_NAME);
+        fs::remove(appmenu_install_dir() / NOO_DESKTOP_NAME);
 }
 
 bool appmenu::is_installed()
 {
-    return fs::exists(appmenu_install_dir() / QBREAK_DESKTOP_NAME);
+    return fs::exists(appmenu_install_dir() / NOO_DESKTOP_NAME);
 }
 #endif
diff --git a/client/preferencesdlg.cpp b/client/preferencesdlg.cpp
index 2debfee..8276aaf 100644
--- a/client/preferencesdlg.cpp
+++ b/client/preferencesdlg.cpp
@@ -8,6 +8,7 @@
 #include <QMessageBox>
 #include <QSysInfo>
 #include <QTextStream>
+#include <QFontDialog>
 
 #define GET_BOOL(KEY) settings.data().value(KEY).toBool()
 
@@ -127,6 +128,16 @@ void PreferencesDlg::allowStartAfterIdleControls()
     ui->mAutomaticallyOnStopRadiobutton->setEnabled(stopEnabled);
 }
 
+void PreferencesDlg::onChangeAppFont()
+{
+    QFontDialog dlg;
+    dlg.setCurrentFont(qApp->font());
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        //
+    }
+}
+
 void PreferencesDlg::applyTheme()
 {
     helper::theme::applyCurrent(mSettings);
diff --git a/client/preferencesdlg.h b/client/preferencesdlg.h
index 4b48f96..b705c7d 100644
--- a/client/preferencesdlg.h
+++ b/client/preferencesdlg.h
@@ -29,7 +29,7 @@ private slots:
     void smartStartSettingChanged(bool);
     void smartStopWayChanged();
     void allowStartAfterIdleControls();
-
+    void onChangeAppFont();
 };
 
 #endif // PREFERENCESDLG_H
diff --git a/client/preferencesdlg.ui b/client/preferencesdlg.ui
index 7f9773d..e8dce02 100644
--- a/client/preferencesdlg.ui
+++ b/client/preferencesdlg.ui
@@ -58,6 +58,23 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QPushButton" name="mChangeAppFont">
+     <property name="text">
+      <string>Change app font...</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="mAppFontExampleLabel">
+     <property name="text">
+      <string>Example of used app font.</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QPushButton" name="mSelectDatabaseButton">
      <property name="text">
diff --git a/client/settings.h b/client/settings.h
index bd0174d..22b194c 100644
--- a/client/settings.h
+++ b/client/settings.h
@@ -42,7 +42,7 @@
 
 #define KEY_DARK_THEME                  "DarkTheme"
 #define KEY_ASK_BEFORE_DELETE           "AskBeforeDelete"
-
+#define KEY_APP_FONT                    "AppFont"
 
 class Settings
 {
diff --git a/client/tasktreemodel.cpp b/client/tasktreemodel.cpp
index af6bf0b..37b51ed 100644
--- a/client/tasktreemodel.cpp
+++ b/client/tasktreemodel.cpp
@@ -133,7 +133,7 @@ QVariant TaskTreeModel::data(const QModelIndex &index, int role) const
         return task->title();
 
     case Qt::DecorationRole:
-        return QIcon(":/icons/icons/text-x-generic.png");
+        return NAMED_BUTTON("text-x-generic.png");
 
     case Qt::CheckStateRole:
         if (mAllowCheckboxes)
@@ -563,7 +563,7 @@ void TaskItemDelegate::paint( QPainter * painter,
 
     if (task->getAttachmentCount())
     {
-        QIcon attachmentIcon = QIcon(":/icons/icons/mail-attachment.png");
+        QIcon attachmentIcon = NAMED_BUTTON("mail-attachment.png");
         QPixmap attachmentPixmap = attachmentIcon.pixmap(option.decorationSize);
         QRect r = option.rect;
         QRect titleRect = r; titleRect.setWidth(r.width() - 24);