diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5624a6f1..dc46f3d83 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,6 +294,7 @@ set(APP_SOURCES
   src/gui/comboboxwithstatus.cpp
   src/gui/basetoolbar.cpp
   src/gui/messagestoolbar.cpp
+  src/gui/toolbareditor.cpp
 
   # DYNAMIC-SHORTCUTS sources.
   src/dynamic-shortcuts/shortcutcatcher.cpp
@@ -333,6 +334,7 @@ set(APP_SOURCES
   src/network-web/webview.cpp
 
   # MAIN sources.
+  src/application.cpp
   src/main.cpp
 )
 
@@ -369,6 +371,7 @@ set(APP_HEADERS
   src/gui/comboboxwithstatus.h
   src/gui/basetoolbar.h
   src/gui/messagestoolbar.h
+  src/gui/toolbareditor.h
 
   # DYNAMIC-SHORTCUTS headers.
   src/dynamic-shortcuts/dynamicshortcutswidget.h
@@ -398,6 +401,9 @@ set(APP_HEADERS
   src/network-web/webfactory.h
   src/network-web/webbrowser.h
   src/network-web/webview.h
+
+  # MAIN headers.
+  src/application.h
 )
 
 # Add form files.
@@ -408,6 +414,7 @@ set(APP_FORMS
   src/gui/formabout.ui
   src/gui/formstandardcategorydetails.ui
   src/gui/formstandardfeeddetails.ui
+  src/gui/toolbareditor.ui
 )
 
 # Add translations.
diff --git a/src/application.cpp b/src/application.cpp
new file mode 100644
index 000000000..b346e3efc
--- /dev/null
+++ b/src/application.cpp
@@ -0,0 +1,9 @@
+#include "application.h"
+
+
+Application::Application(int &argc, char **argv)
+  : QtSingleApplication(argc, argv) {
+}
+
+Application::~Application() {
+}
diff --git a/src/application.h b/src/application.h
new file mode 100644
index 000000000..4c9c5ae87
--- /dev/null
+++ b/src/application.h
@@ -0,0 +1,22 @@
+#ifndef APPLICATION_H
+#define APPLICATION_H
+
+#include "qtsingleapplication/qtsingleapplication.h"
+
+
+// TODO: presunout nektery veci sem, settings atp
+class Application : public QtSingleApplication {
+    Q_OBJECT
+
+  public:
+    // Constructors and destructors.
+    explicit Application(int &argc, char **argv);
+    virtual ~Application();
+
+    // Returns pointer to "GOD" application singleton.
+    inline static Application *instance() {
+      return static_cast<Application*>(QCoreApplication::instance());
+    }
+};
+
+#endif // APPLICATION_H
diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp
index 3f9ab35ac..90ffda8d7 100755
--- a/src/gui/formmain.cpp
+++ b/src/gui/formmain.cpp
@@ -86,6 +86,9 @@ FormMain *FormMain::instance() {
 }
 
 QHash<QString, QAction*> FormMain::allActions() {
+  // TODO: nevytvaret pokazde novej hash ale udelat jeden
+  // a ten pak pouzivat.
+  // tohle by mohl bejt kandidat
   QHash<QString, QAction*> actions;
 
   // Add basic actions.