diff --git a/src/main/KexiModeSelector.cpp b/src/main/KexiModeSelector.cpp
index 932435321..7352caca1 100644
--- a/src/main/KexiModeSelector.cpp
+++ b/src/main/KexiModeSelector.cpp
@@ -1,111 +1,146 @@
 /* This file is part of the KDE project
    Copyright (C) 2016 Jarosław Staniek <staniek@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #include "KexiModeSelector.h"
 #include <kexiutils/KexiStyle.h>
-#include <kexiutils/KexiIcon.h>
 
 #include <KLocalizedString>
 
 #include <QApplication>
 #include <QPainter>
 
 KexiModeSelectorModel::KexiModeSelectorModel(QObject *parent)
     : QAbstractListModel(parent)
 {
 }
 
 int KexiModeSelectorModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     return modes.count();
 }
 
 QVariant KexiModeSelectorModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid() || index.row() >= modes.size())
         return QVariant();
 
     if (role == Qt::DisplayRole) {
         return modes.at(index.row()).name;
     } else if (role == Qt::DecorationRole) {
         return modes.at(index.row()).icon;
     }
     return QVariant();
 }
 
 // ----
 
 KexiModeSelectorDelegate::KexiModeSelectorDelegate(QObject *parent)
  : KexiListViewDelegate(parent)
 {
 }
 
 void KexiModeSelectorDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
                                      const QModelIndex &index) const
 {
     KexiListViewDelegate::paint(painter, option, index);
     KexiStyle::overpaintModeSelectorItem(painter, option, index);
 }
 
 // ----
 
 KexiModeSelector::KexiModeSelector(QWidget *parent)
  : KexiListView(DontUseDelegate, parent)
 {
     KexiStyle::setupModeSelector(this);
     setSpacing(0);
     setContentsMargins(0, 0, 0, 0);
     setFocusPolicy(Qt::NoFocus);
     setEditTriggers(NoEditTriggers);
     setDropIndicatorShown(false);
     setSelectionBehavior(SelectRows);
     setSelectionRectVisible(false);
     setUniformItemSizes(true);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
     setItemDelegate(new KexiModeSelectorDelegate(this));
 
-    KexiMode welcomeMode;
-    welcomeMode.name = xi18n("Welcome");
-    welcomeMode.icon = qApp->windowIcon();
-    model.modes << welcomeMode;
-    KexiMode projectMode;
-    projectMode.name = xi18nc("Project mode", "Project");
-    projectMode.icon = koIcon("project-development");
-    model.modes << projectMode;
-    setModel(&model);
+    KexiStyledIconParameters param;
+    param.color = palette().color(QPalette::Text);
+    param.selectedColor = palette().color(QPalette::HighlightedText);
+    {
+        KexiMode welcomeMode;
+        welcomeMode.name = xi18nc("Welcome mode", "Welcome");
+        param.context = KIconLoader::Action;
+        param.name = "mode-selector-welcome";
+        welcomeMode.icon = KexiStyle::icon(param);
+        m_model.modes << welcomeMode;
+    }
+    {
+        KexiMode projectMode;
+        projectMode.name = xi18nc("Project mode", "Project");
+        param.context = KIconLoader::Action;
+        param.name = "mode-selector-project";
+        projectMode.icon = KexiStyle::icon(param);
+        m_model.modes << projectMode;
+    }
+    {
+        KexiMode dataMode;
+        dataMode.name = xi18nc("Data mode", "Data");
+        param.context = KIconLoader::Action;
+        param.name = "mode-selector-data";
+        dataMode.icon = KexiStyle::icon(param);
+        m_model.modes << dataMode;
+    }
+    {
+        KexiMode designMode;
+        designMode.name = xi18nc("Design mode", "Design");
+        param.context = KIconLoader::Action;
+        param.name = "mode-selector-design";
+        designMode.icon = KexiStyle::icon(param);
+        m_model.modes << designMode;
+    }
+    {
+        KexiMode helpMode;
+        helpMode.name = xi18nc("Help mode", "Help");
+        param.context = KIconLoader::Action;
+        param.name = "mode-selector-help";
+        helpMode.icon = KexiStyle::icon(param);
+        m_model.modes << helpMode;
+    }
+    setModel(&m_model);
+    selectionModel()->select(model()->index(0, 0), QItemSelectionModel::Select);
 }
 
 KexiModeSelector::~KexiModeSelector()
 {
 }
 
 void KexiModeSelector::paintEvent(QPaintEvent *event)
 {
     KexiListView::paintEvent(event);
 
     QRect selectedRect;
     if (!selectedIndexes().isEmpty()) {
         selectedRect = visualRect(selectedIndexes().first());
     }
     QPainter painter(viewport());
     KexiStyle::overpaintModeSelector(this, &painter, selectedRect);
 }
diff --git a/src/main/KexiModeSelector.h b/src/main/KexiModeSelector.h
index f3bd0ed67..3f2b5de09 100644
--- a/src/main/KexiModeSelector.h
+++ b/src/main/KexiModeSelector.h
@@ -1,75 +1,75 @@
 /* This file is part of the KDE project
    Copyright (C) 2016 Jarosław Staniek <staniek@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #ifndef KEXIMODESELECTOR_H
 #define KEXIMODESELECTOR_H
 
 #include <widget/KexiListView.h>
 
 class QPainter;
 
 //! @internal A single global mode
 class KexiMode
 {
 public:
     QString name;
     QIcon icon;
 };
 
 //! @internal A model for KexiModeSelector, each item has name and icon
 class KexiModeSelectorModel : public QAbstractListModel
 {
     Q_OBJECT
 
 public:
     explicit KexiModeSelectorModel(QObject *parent = 0);
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
 
     QVariant data(const QModelIndex &index, int role) const;
 
     QList<KexiMode> modes;
 };
 
 //! @internal A delegate for items of KexiModeSelector
 class KexiModeSelectorDelegate : public KexiListViewDelegate
 {
     Q_OBJECT
 
 public:
     explicit KexiModeSelectorDelegate(QObject *parent = 0);
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
                const QModelIndex &index) const Q_DECL_OVERRIDE;
 };
 
 //! @internal Global mode selector
 class KexiModeSelector : public KexiListView
 {
 public:
     explicit KexiModeSelector(QWidget *parent = 0);
     virtual ~KexiModeSelector();
 
-    KexiModeSelectorModel model;
-
 protected:
     void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
+
+    KexiModeSelectorModel m_model;
 };
 
 #endif // KEXIMODESELECTOR_H
diff --git a/src/pics/icons/breeze/actions/32/mode-selector-data.svg b/src/pics/icons/breeze/actions/32/mode-selector-data.svg
new file mode 100644
index 000000000..3cc4168ed
--- /dev/null
+++ b/src/pics/icons/breeze/actions/32/mode-selector-data.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mode-selector-data.svg"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs5455">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-Background {
+        color:#eff0f1;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      .ColorScheme-ViewText {
+        color:#31363b;
+      }
+      .ColorScheme-ViewBackground {
+        color:#fcfcfc;
+      }
+      .ColorScheme-ViewHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ViewFocus{
+        color:#3daee9;
+      }
+      .ColorScheme-ButtonText {
+        color:#31363b;
+      }
+      .ColorScheme-ButtonBackground {
+        color:#eff0f1;
+      }
+      .ColorScheme-ButtonHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ButtonFocus{
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="4.0709586"
+     inkscape:cy="23.023311"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="957"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4063" />
+    <sodipodi:guide
+       position="4,24"
+       orientation="28,0"
+       id="guide4280" />
+    <sodipodi:guide
+       position="13,4"
+       orientation="0,28"
+       id="guide4282" />
+    <sodipodi:guide
+       position="28,25"
+       orientation="-28,0"
+       id="guide4284" />
+    <sodipodi:guide
+       position="15,28"
+       orientation="0,-28"
+       id="guide4286" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5458">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.57143,-515.798)">
+    <path
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none;stroke-linecap:square"
+       d="m 388.57148,519.79805 c 7.99998,4e-5 16.00001,-7e-5 23.99995,6e-5 -0.10878,0.29242 0.23573,1.03812 -0.2037,0.99994 -7.93209,-3e-5 -15.86424,7e-5 -23.7963,-5e-5 4e-5,-0.33331 -7e-5,-0.66667 5e-5,-0.99995 z"
+       id="rect4544"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none;stroke-linecap:square"
+       d="m 388.57148,522.79805 c 4.33331,4e-5 8.66668,-7e-5 12.99995,6e-5 -0.10878,0.29242 0.23573,1.03812 -0.2037,0.99994 -4.26542,-3e-5 -8.53091,7e-5 -12.7963,-5e-5 4e-5,-0.33331 -7e-5,-0.66667 5e-5,-0.99995 z"
+       id="rect4546"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none;stroke-linecap:square"
+       d="m 388.57148,529.79805 c 7.99998,4e-5 16.00001,-7e-5 23.99995,6e-5 -0.10878,0.29242 0.23573,1.03812 -0.2037,0.99994 -7.93209,-3e-5 -15.86424,7e-5 -23.7963,-5e-5 4e-5,-0.33331 -7e-5,-0.66667 5e-5,-0.99995 z"
+       id="rect4548"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none;stroke-linecap:square"
+       d="m 388.57148,532.79805 c 4.99998,4e-5 10.00001,-7e-5 14.99995,6e-5 -0.10878,0.29242 0.23573,1.03812 -0.2037,0.99994 -4.93209,-3e-5 -9.86424,7e-5 -14.7963,-5e-5 4e-5,-0.33331 -7e-5,-0.66667 5e-5,-0.99995 z"
+       id="rect4550"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none;stroke-linecap:square"
+       d="m 388.57143,539.798 c 7.99998,4e-5 16.00001,-7e-5 23.99995,6e-5 -0.10878,0.29242 0.23573,1.03812 -0.2037,0.99994 -7.93209,-3e-5 -15.86424,7e-5 -23.7963,-5e-5 4e-5,-0.33331 -7e-5,-0.66667 5e-5,-0.99995 z"
+       id="rect4552"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none;stroke-linecap:square"
+       d="m 388.57143,542.798 c 6.33331,4e-5 12.66668,-7e-5 18.99995,6e-5 -0.10878,0.29242 0.23573,1.03812 -0.2037,0.99994 -6.26542,-3e-5 -12.53091,7e-5 -18.7963,-5e-5 4e-5,-0.33331 -7e-5,-0.66667 5e-5,-0.99995 z"
+       id="rect4554"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/src/pics/icons/breeze/actions/32/mode-selector-design.svg b/src/pics/icons/breeze/actions/32/mode-selector-design.svg
new file mode 100644
index 000000000..a97b5a746
--- /dev/null
+++ b/src/pics/icons/breeze/actions/32/mode-selector-design.svg
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mode-selector-design.svg"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs5455">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-Background {
+        color:#eff0f1;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      .ColorScheme-ViewText {
+        color:#31363b;
+      }
+      .ColorScheme-ViewBackground {
+        color:#fcfcfc;
+      }
+      .ColorScheme-ViewHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ViewFocus{
+        color:#3daee9;
+      }
+      .ColorScheme-ButtonText {
+        color:#31363b;
+      }
+      .ColorScheme-ButtonBackground {
+        color:#eff0f1;
+      }
+      .ColorScheme-ButtonHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ButtonFocus{
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="14.177153"
+     inkscape:cy="21.485654"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="957"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4063" />
+    <sodipodi:guide
+       position="4,24"
+       orientation="28,0"
+       id="guide4280" />
+    <sodipodi:guide
+       position="13,4"
+       orientation="0,28"
+       id="guide4282" />
+    <sodipodi:guide
+       position="28,25"
+       orientation="-28,0"
+       id="guide4284" />
+    <sodipodi:guide
+       position="15,28"
+       orientation="0,-28"
+       id="guide4286" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5458">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.57143,-515.798)">
+    <rect
+       width="0"
+       x="265.90979"
+       y="427.30096"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035" />
+    <rect
+       width="0"
+       x="276.35065"
+       y="461.15689"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-8" />
+    <rect
+       width="0"
+       x="279.07059"
+       y="459.5658"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-0" />
+    <rect
+       width="0"
+       x="265.90979"
+       y="427.30096"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-3" />
+    <rect
+       width="0"
+       x="276.35065"
+       y="461.15689"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-8-9" />
+    <rect
+       width="0"
+       x="279.07059"
+       y="459.5658"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-0-4" />
+    <rect
+       width="0"
+       x="265.90979"
+       y="427.30096"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-2" />
+    <rect
+       width="0"
+       x="276.35065"
+       y="461.15689"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-8-99" />
+    <rect
+       width="0"
+       x="279.07059"
+       y="459.5658"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-0-43" />
+    <rect
+       width="0"
+       x="265.90979"
+       y="427.30096"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-3-9" />
+    <rect
+       width="0"
+       x="276.35065"
+       y="461.15689"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-8-9-9" />
+    <rect
+       width="0"
+       x="279.07059"
+       y="459.5658"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-0-4-4" />
+    <rect
+       width="0"
+       x="291.64417"
+       y="432.97284"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-6" />
+    <rect
+       width="0"
+       x="302.08502"
+       y="466.82877"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-8-8" />
+    <rect
+       width="0"
+       x="304.80496"
+       y="465.23767"
+       height="22.002089"
+       style="fill:#4d4d4d;fill-opacity:1"
+       id="rect4035-0-6" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#4d4d4d;fill-opacity:1;stroke-width:6"
+       id="rect5677"
+       d="m 388.57143,534.798 0,9 24,0 0,-9 -9,0 0,1 8,0 0,7 -3,0 0,-3 -1,0 0,3 -4,0 0,-5 -1,0 0,5 -4,0 0,-3 -1,0 0,3 -4,0 0,-5 -1,0 0,5 -3,0 0,-7 4,0 0,-1 z"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd"
+       id="path5693"
+       d="m 399.57143,535.798 13,-13 -3,-3 -13,13 0,3 z"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/src/pics/icons/breeze/actions/32/mode-selector-help.svg b/src/pics/icons/breeze/actions/32/mode-selector-help.svg
new file mode 100644
index 000000000..148134f00
--- /dev/null
+++ b/src/pics/icons/breeze/actions/32/mode-selector-help.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mode-selector-help.svg"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs5455">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-Background {
+        color:#eff0f1;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      .ColorScheme-ViewText {
+        color:#31363b;
+      }
+      .ColorScheme-ViewBackground {
+        color:#fcfcfc;
+      }
+      .ColorScheme-ViewHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ViewFocus{
+        color:#3daee9;
+      }
+      .ColorScheme-ButtonText {
+        color:#31363b;
+      }
+      .ColorScheme-ButtonBackground {
+        color:#eff0f1;
+      }
+      .ColorScheme-ButtonHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ButtonFocus{
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="0.32820471"
+     inkscape:cy="19.885342"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="957"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4063" />
+    <sodipodi:guide
+       position="4,24"
+       orientation="28,0"
+       id="guide4280" />
+    <sodipodi:guide
+       position="13,4"
+       orientation="0,28"
+       id="guide4282" />
+    <sodipodi:guide
+       position="28.019106,26.892155"
+       orientation="-28,0"
+       id="guide4284" />
+    <sodipodi:guide
+       position="15,28"
+       orientation="0,-28"
+       id="guide4286" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5458">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.57143,-515.798)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 400.57143,519.798 c -6.62742,0 -12,5.37258 -12,12 0,6.62742 5.37258,12 12,12 6.62742,0 12,-5.37258 12,-12 0,-6.62742 -5.37258,-12 -12,-12 z m 0,1 c 5.52285,0 11,5.47715 11,11 0,5.52285 -5.47715,11 -11,11 -5.52285,0 -11,-5.47715 -11,-11 0,-5.52285 5.47715,-11 11,-11 z"
+       id="path4140"
+       class="ColorScheme-Text"
+       sodipodi:nodetypes="ssssssssss" />
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
+       id="rect4169"
+       d="m 400.58839,525.798 c -0.97222,0 -1.88002,0.34094 -2.51952,0.98048 -0.63954,0.63954 -0.82422,1.18793 -0.96485,2.05077 l 2,0 c 0.17188,-0.37153 0.14337,-0.40123 0.37891,-0.63673 0.23548,-0.23546 0.57768,-0.39452 1.10546,-0.39452 0.52778,0 0.87,0.159 1.10548,0.39452 0.23546,0.2355 0.39452,0.5777 0.39452,1.10548 0,0.45834 -0.0904,0.65332 -0.21084,0.82616 -0.1206,0.173 -0.31816,0.33608 -0.6123,0.542 -0.29418,0.20584 -0.68494,0.44316 -1.04592,0.86428 -0.36094,0.4211 -0.63084,1.05924 -0.63084,1.76756 l 0,0.5 1.99998,0 0,-0.5 c 0,-0.29168 0.0416,-0.34104 0.1494,-0.4668 0.1078,-0.1258 0.343,-0.29478 0.67384,-0.52638 0.3308,-0.23156 0.75828,-0.53708 1.10642,-1.03612 0.34818,-0.49902 0.57032,-1.17904 0.57032,-1.9707 0,-0.97222 -0.34094,-1.87998 -0.98048,-2.51952 -0.6395,-0.63954 -1.54728,-0.98048 -2.51952,-0.98048 z m -0.99998,10 0,2 1.99998,0 0,-2 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccccssscccsccscccscssccccc" />
+  </g>
+</svg>
diff --git a/src/pics/icons/breeze/actions/32/mode-selector-project.svg b/src/pics/icons/breeze/actions/32/mode-selector-project.svg
new file mode 100644
index 000000000..914381ff2
--- /dev/null
+++ b/src/pics/icons/breeze/actions/32/mode-selector-project.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mode-selector-project.svg"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs5455">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-Background {
+        color:#eff0f1;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      .ColorScheme-ViewText {
+        color:#31363b;
+      }
+      .ColorScheme-ViewBackground {
+        color:#fcfcfc;
+      }
+      .ColorScheme-ViewHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ViewFocus{
+        color:#3daee9;
+      }
+      .ColorScheme-ButtonText {
+        color:#31363b;
+      }
+      .ColorScheme-ButtonBackground {
+        color:#eff0f1;
+      }
+      .ColorScheme-ButtonHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ButtonFocus{
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.333329"
+     inkscape:cx="3.2558696"
+     inkscape:cy="12.351623"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="957"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4063" />
+    <sodipodi:guide
+       position="4,24"
+       orientation="28,0"
+       id="guide4280" />
+    <sodipodi:guide
+       position="13,4"
+       orientation="0,28"
+       id="guide4282" />
+    <sodipodi:guide
+       position="28,25"
+       orientation="-28,0"
+       id="guide4284" />
+    <sodipodi:guide
+       position="15,28"
+       orientation="0,-28"
+       id="guide4286" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5458">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.57143,-515.798)">
+    <path
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none"
+       d="m 388.57143,519.798 0,24 24,0 0,-24 z m 1,4 22,0 0,19 -22,0 z"
+       id="rect4083"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+  </g>
+</svg>
diff --git a/src/pics/icons/breeze/actions/32/mode-selector-welcome.svg b/src/pics/icons/breeze/actions/32/mode-selector-welcome.svg
new file mode 100644
index 000000000..0d8f960dc
--- /dev/null
+++ b/src/pics/icons/breeze/actions/32/mode-selector-welcome.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg5453"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mode-selector-welcome.svg"
+   viewBox="0 0 32 32">
+  <defs
+     id="defs5455">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-Background {
+        color:#eff0f1;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      .ColorScheme-ViewText {
+        color:#31363b;
+      }
+      .ColorScheme-ViewBackground {
+        color:#fcfcfc;
+      }
+      .ColorScheme-ViewHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ViewFocus{
+        color:#3daee9;
+      }
+      .ColorScheme-ButtonText {
+        color:#31363b;
+      }
+      .ColorScheme-ButtonBackground {
+        color:#eff0f1;
+      }
+      .ColorScheme-ButtonHover {
+        color:#93cee9;
+      }
+      .ColorScheme-ButtonFocus{
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-12.941704"
+     inkscape:cy="33.246622"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="957"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4063" />
+    <sodipodi:guide
+       position="4,24"
+       orientation="28,0"
+       id="guide4280" />
+    <sodipodi:guide
+       position="13,4"
+       orientation="0,28"
+       id="guide4282" />
+    <sodipodi:guide
+       position="28,25"
+       orientation="-28,0"
+       id="guide4284" />
+    <sodipodi:guide
+       position="15,28"
+       orientation="0,-28"
+       id="guide4286" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5458">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.57143,-515.798)">
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none"
+       d="m 388.57143,520.798 0,7 24,0 0,-7 z m 1,1 22,0 0,5 -22,0 z"
+       id="rect4083"
+       class="ColorScheme-Text"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       sodipodi:nodetypes="cccccccccc"
+       class="ColorScheme-Text"
+       id="path5433"
+       d="m 388.57143,528.798 0,7 24,0 0,-7 z m 1,1 22,0 0,5 -17,0 z"
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#4d4d4d;fill:currentColor;fill-opacity:1;stroke:none"
+       d="m 388.57143,536.798 0,7 24,0 0,-7 z m 1,1 22,0 0,5 -17,0 z"
+       id="path5435"
+       class="ColorScheme-Text"
+       sodipodi:nodetypes="cccccccccc" />
+  </g>
+</svg>
diff --git a/src/pics/kexi_breeze_files.cmake b/src/pics/kexi_breeze_files.cmake
index 47331ac88..4eaf4dc81 100644
--- a/src/pics/kexi_breeze_files.cmake
+++ b/src/pics/kexi_breeze_files.cmake
@@ -1,133 +1,138 @@
 # List of project's own icon files
 # This file is generated by update_kexi_breeze_list.sh
 # WARNING! All changes made in this file will be lost!
 
 set(_PNG_FILES
 calligra-logo-black-glow.png
 calligra-logo-white-glow.png
 icons/breeze/actions/16/add-field.png
 icons/breeze/actions/16/autofield.png
 icons/breeze/actions/16/database-relations.png
 icons/breeze/actions/16/data-view.png
 icons/breeze/actions/16/design-view.png
 icons/breeze/actions/16/form-action.png
 icons/breeze/actions/16/lineedit.png
 icons/breeze/actions/16/multiple-objects.png
 icons/breeze/actions/16/radiobutton.png
 icons/breeze/actions/16/sql-view.png
 icons/breeze/actions/16/textedit.png
 icons/breeze/actions/16/unknown-widget.png
 icons/breeze/actions/16/widgets.png
 icons/breeze/actions/22/autofield.png
 icons/breeze/actions/22/database-relations.png
 icons/breeze/actions/22/data-view.png
 icons/breeze/actions/22/dateedit.png
 icons/breeze/actions/22/datetimeedit.png
 icons/breeze/actions/22/design-view.png
 icons/breeze/actions/22/form-action.png
 icons/breeze/actions/22/label.png
 icons/breeze/actions/22/lineedit.png
 icons/breeze/actions/22/multiple-objects.png
 icons/breeze/actions/22/progressbar.png
 icons/breeze/actions/22/radiobutton.png
 icons/breeze/actions/22/slider.png
 icons/breeze/actions/22/spinbox.png
 icons/breeze/actions/22/sql-view.png
 icons/breeze/actions/22/textedit.png
 icons/breeze/actions/22/timeedit.png
 icons/breeze/actions/22/unknown-widget.png
 icons/breeze/actions/22/widgets.png
 icons/breeze/actions/32/data-view.png
 icons/breeze/actions/32/form-action.png
 icons/breeze/actions/32/sql-view.png
 kexi-autonumber.png
 kexi-tableview-pen.png
 kexi-tableview-plus.png
 kexi-tableview-pointer.png
 )
 
 set(_SVG_OBJECT_FILES
 icons/breeze/actions/16/form.svg
 icons/breeze/actions/16/macro.svg
 icons/breeze/actions/16/query.svg
 icons/breeze/actions/16/report.svg
 icons/breeze/actions/16/script.svg
 icons/breeze/actions/16/table.svg
 icons/breeze/actions/22/form.svg
 icons/breeze/actions/22/macro.svg
 icons/breeze/actions/22/query.svg
 icons/breeze/actions/22/report.svg
 icons/breeze/actions/22/script.svg
 icons/breeze/actions/22/table.svg
 icons/breeze/actions/32/form.svg
 icons/breeze/actions/32/macro.svg
 icons/breeze/actions/32/query.svg
 icons/breeze/actions/32/report.svg
 icons/breeze/actions/32/script.svg
 icons/breeze/actions/32/table.svg
 )
 
 set(_SVG_FILES
 icons/breeze/actions/16/button.svg
 icons/breeze/actions/16/checkbox.svg
 icons/breeze/actions/16/combobox.svg
 icons/breeze/actions/16/database-key.svg
 icons/breeze/actions/16/data-source-tag.svg
 icons/breeze/actions/16/edit-table-clear.svg
 icons/breeze/actions/16/edit-table-delete-row.svg
 icons/breeze/actions/16/edit-table-insert-row.svg
 icons/breeze/actions/16/file-database.svg
 icons/breeze/actions/16/frame.svg
 icons/breeze/actions/16/groupbox.svg
 icons/breeze/actions/16/imagebox.svg
 icons/breeze/actions/16/line-horizontal.svg
 icons/breeze/actions/16/line-vertical.svg
 icons/breeze/actions/16/network-server-database.svg
 icons/breeze/actions/16/tabwidget-page.svg
 icons/breeze/actions/16/tabwidget.svg
 icons/breeze/actions/16/validate.svg
 icons/breeze/actions/22/button.svg
 icons/breeze/actions/22/checkbox.svg
 icons/breeze/actions/22/combobox.svg
 icons/breeze/actions/22/database-import.svg
 icons/breeze/actions/22/database-key.svg
 icons/breeze/actions/22/data-source-tag.svg
 icons/breeze/actions/22/document-empty.svg
 icons/breeze/actions/22/edit-table-clear.svg
 icons/breeze/actions/22/edit-table-delete-row.svg
 icons/breeze/actions/22/edit-table-insert-row.svg
 icons/breeze/actions/22/file-database.svg
 icons/breeze/actions/22/frame.svg
 icons/breeze/actions/22/groupbox.svg
 icons/breeze/actions/22/imagebox.svg
 icons/breeze/actions/22/line-horizontal.svg
 icons/breeze/actions/22/line-vertical.svg
 icons/breeze/actions/22/network-server-database.svg
 icons/breeze/actions/22/tabwidget-page.svg
 icons/breeze/actions/22/tabwidget.svg
 icons/breeze/actions/22/validate.svg
 icons/breeze/actions/32/button.svg
 icons/breeze/actions/32/checkbox.svg
 icons/breeze/actions/32/combobox.svg
 icons/breeze/actions/32/database-key.svg
 icons/breeze/actions/32/data-source-tag.svg
 icons/breeze/actions/32/document-empty.svg
 icons/breeze/actions/32/edit-table-clear.svg
 icons/breeze/actions/32/edit-table-delete-row.svg
 icons/breeze/actions/32/edit-table-insert-row.svg
 icons/breeze/actions/32/file-database.svg
 icons/breeze/actions/32/frame.svg
 icons/breeze/actions/32/groupbox.svg
 icons/breeze/actions/32/imagebox.svg
 icons/breeze/actions/32/line-horizontal.svg
 icons/breeze/actions/32/line-vertical.svg
+icons/breeze/actions/32/mode-selector-data.svg
+icons/breeze/actions/32/mode-selector-design.svg
+icons/breeze/actions/32/mode-selector-help.svg
+icons/breeze/actions/32/mode-selector-project.svg
+icons/breeze/actions/32/mode-selector-welcome.svg
 icons/breeze/actions/32/network-server-database.svg
 icons/breeze/actions/32/tabwidget-page.svg
 icons/breeze/actions/32/tabwidget.svg
 icons/breeze/actions/32/validate.svg
 icons/breeze/apps/16/kexi.svg
 icons/breeze/apps/32/kexi.svg
 icons/breeze/apps/48/kexi.svg
 )
 
 set(_FILES ${_PNG_FILES} ${_SVG_OBJECT_FILES} ${_SVG_FILES})