diff --git a/cmake/modules/KexiAddIconsRccFile.cmake b/cmake/modules/KexiAddIconsRccFile.cmake
new file mode 100644
index 000000000..1cb155226
--- /dev/null
+++ b/cmake/modules/KexiAddIconsRccFile.cmake
@@ -0,0 +1,81 @@
+# Copyright (C) 2016 Jarosław Staniek <staniek@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+add_custom_target(update_all_rcc
+    COMMENT "Updating all file lists for rcc icons files"
+)
+
+# Builds and install an rcc file with icons.
+# - resource subdirectory in the current build subdir is created
+# - ${_target}.qrc is created based on icons/${_theme}/files.cmake
+# - ${_target}.rcc is generated using rcc-qt5
+# - if _prefix is not empty, icons are placed in icons/${_prefix}/${_theme} path (useful for plugins)
+# - dependency for the parent target ${_parent_target} is added
+# - the .rcc file is installed to ${ICONS_INSTALL_DIR}
+# - update_${_target} target is added for requesting update of icons/${_theme}/files.cmake
+# - adds a update_all_rcc target that executes commands for all targets created with kexi_add_icons_rcc_file()
+macro(kexi_add_icons_rcc_file _target _parent_target _theme _prefix)
+    set(_BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}/resource)
+    set(_QRC_FILE "${_BASE_DIR}/${_target}.qrc")
+    set(_RCC_DIR "${CMAKE_BINARY_DIR}/bin/data/icons")
+    set(_RCC_FILE "${_RCC_DIR}/${_target}.rcc")
+    include(icons/${_theme}/files.cmake)
+
+    add_custom_target(${_target}_copy_icons
+        COMMAND ${CMAKE_COMMAND} -E remove_directory ${_BASE_DIR}
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${_BASE_DIR}
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${_RCC_DIR}
+        COMMAND ${CMAKE_COMMAND} -E copy_directory icons/${_theme} ${_BASE_DIR}/icons/${_prefix}/${_theme}
+        COMMAND ${CMAKE_COMMAND} -E remove -f ${_BASE_DIR}/CMakeLists.txt
+        COMMAND ${CMAKE_COMMAND} -E remove -f ${_BASE_DIR}/icons/${_prefix}/${_theme}/files.cmake
+        DEPENDS "${_FILES}"
+        SOURCES "${_FILES}"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        COMMENT "Copying icon files to ${_BASE_DIR}"
+        VERBATIM
+    )
+
+    add_custom_target(${_target}_build_qrc
+        COMMAND ${Qt5Core_RCC_EXECUTABLE} --project -o "${CMAKE_CURRENT_BINARY_DIR}/${_target}.qrc"
+        # avoid adding the .qrc file to rcc due to rcc misfeature
+        COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_CURRENT_BINARY_DIR}/${_target}.qrc" "${_QRC_FILE}"
+        DEPENDS "${_FILES}"
+        SOURCES "${_FILES}"
+        WORKING_DIRECTORY "${_BASE_DIR}"
+        COMMENT "Building Qt resource file ${_QRC_FILE}"
+        VERBATIM
+    )
+    add_dependencies(${_target}_build_qrc ${_target}_copy_icons)
+
+    add_custom_target(${_target}_build_rcc
+        COMMAND ${Qt5Core_RCC_EXECUTABLE} --compress 9 --threshold 0 --binary
+                --output "${_RCC_FILE}" "${_QRC_FILE}"
+        DEPENDS "${_QRC_FILE}" "${_FILES}"
+        WORKING_DIRECTORY "${_BASE_DIR}"
+        COMMENT "Building external Qt resource ${_RCC_FILE}"
+        VERBATIM
+    )
+    add_dependencies(${_target}_build_rcc ${_target}_build_qrc)
+
+    add_dependencies(${_parent_target} ${_target}_build_rcc)
+
+    install(FILES
+            ${_RCC_FILE}
+            DESTINATION "${ICONS_INSTALL_DIR}"
+    )
+
+    add_update_file_target(
+        TARGET update_${_target}
+        COMMAND "${PROJECT_SOURCE_DIR}/cmake/modules/update_icon_list.sh"
+                ${_theme} icons/${_theme}/files.cmake
+        FILE ${_target}_files.cmake
+        SOURCES "${PROJECT_SOURCE_DIR}/cmake/modules/update_icon_list.sh"
+    )
+    add_dependencies(update_all_rcc update_${_target})
+
+    unset(_BASE_DIR)
+    unset(_QRC_FILE)
+    unset(_RCC_FILE)
+endmacro()
diff --git a/cmake/modules/update_icon_list.sh b/cmake/modules/update_icon_list.sh
new file mode 100755
index 000000000..f2e2405e5
--- /dev/null
+++ b/cmake/modules/update_icon_list.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+#  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.1 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.
+#
+# Updates list of icon files in icons/$1/ and outputs to $2.
+# Used by kexi_add_icons_rcc_file() cmake macro.
+#
+set -e
+
+theme=$1
+output=$2
+if [ -z "$theme" ] ; then echo "Theme name required as first argument"; exit 1; fi
+if [ -z "$output" ] ; then echo "Output .cmake file required as second argument"; exit 1; fi
+script=$(basename $0)
+
+function content()
+{
+    echo "# List of project's own icon files"
+    echo "# This file is generated by $script"
+    echo "# WARNING! All changes made in this file will be lost!"
+    echo
+    echo "set(_PNG_FILES"
+    find icons/$theme/ -name \*png | sed "s/\.\///g" | sort
+    echo ")"
+    echo
+
+    echo "set(_SVG_FILES"
+    find icons/$theme/ -name \*svg | sed "s/\.\///g" | sort
+    echo ")"
+    echo
+
+    echo "set(_FILES \${_PNG_FILES} \${_SVG_FILES})"
+}
+
+content > $output
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d66e42786..9d5429b1e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,99 +1,95 @@
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 option(KEXI_MOBILE "Compile a mobile version of Kexi" OFF)
 
 check_function_exists("uname" HAVE_UNAME)
 
 option(KEXI_SHOW_UNFINISHED "Show unfinished features in Kexi. Thus is useful for testing but may confuse end-user." OFF)
 option(KEXI_SHOW_UNIMPLEMENTED "Forces to show menu entries and dialogs just to give impression about development plans for Kexi. Only recommended for test/development versions." OFF)
 
 # Extra GUI features
 option(KEXI_AUTORISE_TABBED_TOOLBAR "Experimental: Autorise the main tabbed toolbar in Kexi" OFF)
 
 # Experimental:
 option(KEXI_SCRIPTS_SUPPORT "Experimental: Enable scripting in Kexi" ON)
 
 # Broken:
 option(KEXI_FORM_CURSOR_PROPERTY_SUPPORT "Broken: Enable \"cursor\" property in the form designer" OFF)
 option(KEXI_SHOW_CONTEXT_HELP "Broken: Enable context help in Kexi main window" OFF)
 option(KEXI_QUICK_PRINTING_SUPPORT "Broken: Enable print/print preview/print setup for tables/queries in the project navigator" OFF)
 option(KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT "Broken: Enable \"auto field\" form widget in the form designer" OFF)
 # OFF because we need to replace it with QTreeWidget which uses very different API compared to Q3ListView. Re-add QTreeWidget?
 option(KEXI_LIST_FORM_WIDGET_SUPPORT "Broken: Enable \"list\" form widget in the form designer" OFF)
 option(KEXI_PIXMAP_COLLECTIONS_SUPPORT "Broken: Enable support for pixmap collections" OFF)
 
 # Not available:
 option(KEXI_MACROS_SUPPORT "Experimental: Enable macros in Kexi" OFF)
 if(KEXI_MACROS_SUPPORT) # temp.
     message(FATAL_ERROR "Macros are not yet available.")
 endif()
 option(KEXI_TABLE_PRINT_SUPPORT "Experimental: Enable printing of tabular view in Kexi" OFF) # broken since Kexi 2
 if(KEXI_TABLE_PRINT_SUPPORT) # temp.
     message(FATAL_ERROR "Table printing is not yet available.")
 endif()
 option(KEXI_PROJECT_TEMPLATES "Experimental: Enable support for project templates in Kexi" OFF) # broken since Kexi 2
 if(KEXI_PROJECT_TEMPLATES) # temp.
     message(FATAL_ERROR "Project templates are not yet available.")
 endif()
 
 #See commit 1e433a54cd9, left here for reference
 #option(KEXI_SQLITE_MIGRATION "If defined, SQLite3 migration to some newer format is possible. Users can see a suitable question on app's startup." OFF)
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kexi\")
 
-set(KEXI_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/kexi)
-set(KEXI_FORM_WIDGETS_PLUGIN_INSTALL_DIR ${KEXI_PLUGIN_INSTALL_DIR}/forms/widgets)
-
-
 #no default: add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44010)
 
 configure_file(config-kexi.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kexi.h )
 configure_file(KexiVersion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/KexiVersion.h)
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/core
 )
 
 add_subdirectory( kexiutils )
 add_subdirectory( core )
 add_subdirectory( widget )
 add_subdirectory( data )
 add_subdirectory( plugins )
 if (BUILD_TESTING)
 #TODO KEXI3 add_subdirectory( tests )
 endif()
 
 if(KEXI_MOBILE)
 
 else()
   add_subdirectory( main )
   add_subdirectory( formeditor )
   add_subdirectory( migration )
 endif()
 
 ########### next target ###############
 
 if(KEXI_MOBILE)
   add_subdirectory( mobile )
 else()
   set(kexi_SRCS
     main.cpp
     Messages.sh
 
     # non-source:
     ${CMAKE_SOURCE_DIR}/kexi_xgettext.sh
     Mainpage.dox
     Messages.sh
   )
   kexi_add_app_icons(kexi_SRCS)
   add_executable(kexi ${kexi_SRCS})
   target_link_libraries(kexi
     PRIVATE
       keximain
   )
   install(TARGETS kexi ${INSTALL_TARGETS_DEFAULT_ARGS})
 endif()
 
 add_subdirectory( pics )
diff --git a/src/formeditor/CMakeLists.txt b/src/formeditor/CMakeLists.txt
index d61be85c6..65459b51b 100644
--- a/src/formeditor/CMakeLists.txt
+++ b/src/formeditor/CMakeLists.txt
@@ -1,65 +1,69 @@
-add_subdirectory( factories )
-
-include_directories(${CMAKE_SOURCE_DIR}/src/widget ${CMAKE_SOURCE_DIR}/src/widget/utils
-${CMAKE_SOURCE_DIR}/src/widget/tableview ${CMAKE_SOURCE_DIR}/src/core)
-
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44010)
 
+include_directories(
+    ${CMAKE_SOURCE_DIR}/src/widget
+    ${CMAKE_SOURCE_DIR}/src/widget/utils
+    ${CMAKE_SOURCE_DIR}/src/widget/tableview
+    ${CMAKE_SOURCE_DIR}/src/widget/properties
+    ${CMAKE_SOURCE_DIR}/src/core
+    ${CMAKE_SOURCE_DIR}/src/kexiutils/style
+)
+
 # enable to add signal/slot connections
 # set(KFD_SIGSLOTS true)
 
 ########### next target ###############
 
 set(kformdesigner_LIB_SRCS
    container.cpp
    resizehandle.cpp
    widgetfactory.cpp
    widgetlibrary.cpp
    KexiFormWidgetsPluginMetaData.cpp
    WidgetInfo.cpp
    libactionwidget.cpp
    form.cpp
    form_p.cpp
    objecttree.cpp
    formIO.cpp
    FormWidget.cpp
    FormWidgetInterface.cpp
    WidgetTreeWidget.cpp
    commands.cpp
    events.cpp
    richtextdialog.cpp
    tabstopdialog.cpp
 #KEXI_LIST_FORM_WIDGET_SUPPORT:   editlistviewdialog.cpp
    utils.cpp
 #todo   kfdpixmapedit.cpp
    widgetwithsubpropertiesinterface.cpp
    kexiformeventhandler.cpp # from libkexiformutils
    kexiactionselectiondialog.cpp # from libkexiformutils
 )
 
 set(kformdesigner_LIBS
   kexiutils
   kexicore
   kexiextendedwidgets
   kexiundo
 
   KDb
   KPropertyWidgets
 )
 
 if(KFD_SIGSLOTS)
   add_definitions(
     -DKFD_SIGSLOTS=1
   )
   list(APPEND kformdesigner_LIB_SRCS connectiondialog.cpp)
   list(APPEND kformdesigner_LIBS kexiextendedwidgets kexidatatable)
 endif()
 
 add_library(kformdesigner SHARED ${kformdesigner_LIB_SRCS})
 
 generate_export_header(kformdesigner)
 
 target_link_libraries(kformdesigner ${kformdesigner_LIBS})
 
 set_target_properties(kformdesigner PROPERTIES VERSION ${GENERIC_PROJECT_LIB_VERSION} SOVERSION ${GENERIC_PROJECT_LIB_SOVERSION} )
 install(TARGETS kformdesigner  ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/formeditor/factories/CMakeLists.txt b/src/formeditor/factories/CMakeLists.txt
deleted file mode 100644
index 2318beaf3..000000000
--- a/src/formeditor/factories/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-include_directories(${CMAKE_SOURCE_DIR}/src/formeditor ${CMAKE_SOURCE_DIR}/src/core)
-
-set(kexiforms_standardwidgetsplugin_SRCS
-    KexiStandardFormWidgetsFactory.cpp
-    KexiStandardFormWidgets.cpp
-    KexiStandardContainerFormWidgets.cpp
-)
-
-add_library(kexiforms_standardwidgetsplugin MODULE ${kexiforms_standardwidgetsplugin_SRCS})
-kcoreaddons_desktop_to_json(kexiforms_standardwidgetsplugin kexiforms_standardwidgetsplugin.desktop)
-
-target_link_libraries(kexiforms_standardwidgetsplugin
-    kformdesigner
-    kexiundo
-
-    Qt5::Core
-    Qt5::Gui
-    Qt5::Xml
-)
-
-install(TARGETS kexiforms_standardwidgetsplugin DESTINATION ${KEXI_FORM_WIDGETS_PLUGIN_INSTALL_DIR})
diff --git a/src/formeditor/factories/KexiStandardFormWidgetsFactory.cpp b/src/formeditor/factories/KexiStandardFormWidgetsFactory.cpp
deleted file mode 100644
index a8ab83f15..000000000
--- a/src/formeditor/factories/KexiStandardFormWidgetsFactory.cpp
+++ /dev/null
@@ -1,1069 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2003 by Lucijan Busch <lucijan@kde.org>
-   Copyright (C) 2004 Cedric Pasteur <cedric.pasteur@free.fr>
-   Copyright (C) 2009-2014 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 "KexiStandardFormWidgetsFactory.h"
-#include "KexiStandardFormWidgets.h"
-#include "KexiStandardContainerFormWidgets.h"
-#include "formIO.h"
-#include "form.h"
-#include "widgetlibrary.h"
-#include "objecttree.h"
-#include "WidgetInfo.h"
-#include <kexiutils/utils.h>
-#include <KexiIcon.h>
-#include <kexi.h>
-
-#include <KProperty>
-#include <KPropertySet>
-
-#include <KComboBox>
-#include <KTextEdit>
-#include <KLocalizedString>
-
-#include <QStackedWidget>
-#include <QLabel>
-#include <QRadioButton>
-#include <QCheckBox>
-#include <QSlider>
-#include <QDomDocument>
-#include <QStyle>
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-#include <QTreeWidget>
-#endif
-#include <QPixmap>
-#include <QFrame>
-#include <QList>
-#include <QProgressBar>
-#include <QTimeEdit>
-#include <QDateEdit>
-#include <QDateTimeEdit>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QAction>
-#include <QSpinBox>
-#include <QDebug>
-
-KEXI_PLUGIN_FACTORY(KexiStandardFormWidgetsFactory, "kexiforms_standardwidgetsplugin.json")
-
-KexiStandardFormWidgetsFactory::KexiStandardFormWidgetsFactory(QObject *parent, const QVariantList &args)
-        : KFormDesigner::WidgetFactory(parent)
-{
-    Q_UNUSED(args);
-    KFormDesigner::WidgetInfo *wFormWidget = new KFormDesigner::WidgetInfo(this);
-    wFormWidget->setIconName(KexiIconName("form"));
-    wFormWidget->setClassName("FormWidgetBase");
-    wFormWidget->setName(xi18n("Form"));
-    wFormWidget->setNamePrefix(
-        xi18nc("A prefix for identifiers of form widgets. Based on that, identifiers such as "
-            "form1, form2 are generated. "
-            "This string can be used to refer the widget object as variables in programming "
-            "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
-            "should start with lower case letter and if there are subsequent words, these should "
-            "start with upper case letter. Example: smallCamelCase. "
-            "Moreover, try to make this prefix as short as possible.",
-            "form"));
-    wFormWidget->setDescription(xi18n("A simple form widget"));
-    addClass(wFormWidget);
-
-    KFormDesigner::WidgetInfo *wCustomWidget = new KFormDesigner::WidgetInfo(this);
-    wCustomWidget->setIconName(KexiIconName("unknown-widget"));
-    wCustomWidget->setClassName("CustomWidget");
-    wCustomWidget->setName(/* no i18n needed */ "Custom Widget");
-    wCustomWidget->setNamePrefix(/* no i18n needed */ "customWidget");
-    wCustomWidget->setDescription(/* no i18n needed */ "A custom or non-supported widget");
-    addClass(wCustomWidget);
-
-    KFormDesigner::WidgetInfo *wLabel = new KFormDesigner::WidgetInfo(this);
-    wLabel->setIconName(KexiIconName("label"));
-    wLabel->setClassName("QLabel");
-    wLabel->setName(/* no i18n needed */ "Text Label");
-    wLabel->setNamePrefix(/* no i18n needed */ "label");
-    wLabel->setDescription(/* no i18n needed */ "A widget to display text");
-    wLabel->setAutoSaveProperties(QList<QByteArray>() << "text");
-    addClass(wLabel);
-
-    KFormDesigner::WidgetInfo *wPixLabel = new KFormDesigner::WidgetInfo(this);
-    wPixLabel->setIconName(KexiIconName("imagebox"));
-    wPixLabel->setClassName("KexiPictureLabel");
-    wPixLabel->setName(/* no i18n needed */ "Picture Label");
-//! @todo Qt designer compatibility: maybe use this class when QLabel has a pixmap set...?
-    wPixLabel->setSavingName("KexiPictureLabel");
-    wPixLabel->setNamePrefix(/* no i18n needed */ "picture");
-    wPixLabel->setDescription(/* no i18n needed */ "A widget to display pictures");
-    wPixLabel->setAutoSaveProperties(QList<QByteArray>() << "pixmap");
-    addClass(wPixLabel);
-
-    KFormDesigner::WidgetInfo *wLineEdit = new KFormDesigner::WidgetInfo(this);
-    wLineEdit->setIconName(KexiIconName("lineedit"));
-    wLineEdit->setClassName("QLineEdit");
-    wLineEdit->addAlternateClassName("KLineEdit");
-    wLineEdit->setIncludeFileName("qlineedit.h");
-    wLineEdit->setName(/* no i18n needed */ "Line Edit");
-    wLineEdit->setNamePrefix(/* no i18n needed */ "lineEdit");
-    wLineEdit->setDescription(/* no i18n needed */ "A widget to input text");
-    addClass(wLineEdit);
-
-    KFormDesigner::WidgetInfo *wPushButton = new KFormDesigner::WidgetInfo(this);
-    wPushButton->setIconName(KexiIconName("button"));
-    wPushButton->setClassName("QPushButton");
-    wPushButton->addAlternateClassName("KPushButton");
-    wPushButton->setIncludeFileName("qpushbutton.h");
-    wPushButton->setName(/* no i18n needed */ "Push Button");
-    wPushButton->setNamePrefix(/* no i18n needed */ "button");
-    wPushButton->setDescription(/* no i18n needed */ "A simple push button to execute actions");
-    wPushButton->setAutoSaveProperties(QList<QByteArray>() << "text");
-    addClass(wPushButton);
-
-    KFormDesigner::WidgetInfo *wRadioButton = new KFormDesigner::WidgetInfo(this);
-    wRadioButton->setIconName(KexiIconName("radiobutton"));
-    wRadioButton->setClassName("QRadioButton");
-    wRadioButton->setName(/* no i18n needed */ "Option Button");
-    wRadioButton->setNamePrefix(/* no i18n needed */ "option");
-    wRadioButton->setDescription(/* no i18n needed */ "An option button with text or pixmap label");
-    addClass(wRadioButton);
-
-    KFormDesigner::WidgetInfo *wCheckBox = new KFormDesigner::WidgetInfo(this);
-    wCheckBox->setIconName(KexiIconName("checkbox"));
-    wCheckBox->setClassName("QCheckBox");
-    wCheckBox->setName(/* no i18n needed */ "Check Box");
-    wCheckBox->setNamePrefix(/* no i18n needed */ "checkBox");
-    wCheckBox->setDescription(/* no i18n needed */ "A check box with text or pixmap label");
-    addClass(wCheckBox);
-
-    KFormDesigner::WidgetInfo *wSpinBox = new KFormDesigner::WidgetInfo(this);
-    wSpinBox->setIconName(KexiIconName("spinbox"));
-    wSpinBox->setClassName("QSpinBox");
-    wSpinBox->addAlternateClassName("KIntSpinBox");
-    wSpinBox->setIncludeFileName("qspinbox.h");
-    wSpinBox->setName(/* no i18n needed */ "Spin Box");
-    wSpinBox->setNamePrefix(/* no i18n needed */ "spinBox");
-    wSpinBox->setDescription(/* no i18n needed */ "A spin box widget");
-    addClass(wSpinBox);
-
-    KFormDesigner::WidgetInfo *wComboBox = new KFormDesigner::WidgetInfo(this);
-    wComboBox->setIconName(KexiIconName("combobox"));
-    wComboBox->setClassName("KComboBox");
-    wComboBox->addAlternateClassName("QComboBox");
-    wComboBox->setIncludeFileName("KComboBox");
-    wComboBox->setName(/* no i18n needed */ "Combo Box");
-    wComboBox->setNamePrefix(/* no i18n needed */ "comboBox");
-    wComboBox->setDescription(/* no i18n needed */ "A combo box widget");
-    wComboBox->setAutoSaveProperties(QList<QByteArray>() << "list_items");
-    addClass(wComboBox);
-
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-// Unused, commented-out in Kexi 2.9 to avoid unnecessary translations:
-//     KFormDesigner::WidgetInfo *wListBox = new KFormDesigner::WidgetInfo(this);
-//     wListBox->setIconName(KexiIconName("listbox"));
-//     wListBox->setClassName("KListBox");
-//     wListBox->addAlternateClassName("QListBox");
-//     wListBox->addAlternateClassName("KListBox");
-//     wListBox->setIncludeFileName("qlistbox.h");
-//     wListBox->setName(xi18n("List Box"));
-//     wListBox->setNamePrefix(
-//         xi18nc("Widget name. This string will be used to name widgets of this class. "
-//    "It must _not_ contain white spaces and non latin1 characters.", "listBox"));
-//     wListBox->setDescription(xi18n("A simple list widget"));
-//     wListBox->setAutoSaveProperties(QList<QByteArray>() << "list_items");
-//     addClass(wListBox);
-
-// Unused, commented-out in Kexi 2.9 to avoid unnecessary translations:
-//     KFormDesigner::WidgetInfo *wTreeWidget = new KFormDesigner::WidgetInfo(this);
-//     wTreeWidget->setIconName(KexiIconName("listwidget"));
-//     wTreeWidget->setClassName("QTreetWidget");
-// //?    wTreeWidget->addAlternateClassName("QListView");
-// //?    wTreeWidget->addAlternateClassName("KListView");
-//     wTreeWidget->setIncludeFileName("qtreewidget.h");
-//     wTreeWidget->setName(xi18n("List Widget"));
-//     wTreeWidget->setNamePrefix(
-//         xi18nc("Widget name. This string will be used to name widgets of this class. "
-//    "It must _not_ contain white spaces and non latin1 characters.", "listWidget"));
-//     wTreeWidget->setDescription(xi18n("A list (or tree) widget"));
-//     wTreeWidget->setAutoSaveProperties(QList<QByteArray>() << "list_contents");
-//     addClass(wTreeWidget);
-#endif
-
-    KFormDesigner::WidgetInfo *wTextEdit = new KFormDesigner::WidgetInfo(this);
-    wTextEdit->setIconName(KexiIconName("textedit"));
-    wTextEdit->setClassName("KTextEdit");
-    wTextEdit->addAlternateClassName("QTextEdit");
-    wTextEdit->setIncludeFileName("KTextEdit");
-    wTextEdit->setName(/* no i18n needed */ "Text Editor");
-    wTextEdit->setNamePrefix(/* no i18n needed */ "textEditor");
-    wTextEdit->setDescription(/* no i18n needed */ "A simple single-page rich text editor");
-    wTextEdit->setAutoSaveProperties(QList<QByteArray>() << "text");
-    addClass(wTextEdit);
-
-    KFormDesigner::WidgetInfo *wSlider = new KFormDesigner::WidgetInfo(this);
-    wSlider->setIconName(KexiIconName("slider"));
-    wSlider->setClassName("QSlider");
-    wSlider->setName(/* no i18n needed */ "Slider");
-    wSlider->setNamePrefix(/* no i18n needed */ "slider");
-    wSlider->setDescription(/* no i18n needed */ "A Slider widget");
-    addClass(wSlider);
-
-    KFormDesigner::WidgetInfo *wProgressBar = new KFormDesigner::WidgetInfo(this);
-    wProgressBar->setIconName(KexiIconName("progressbar"));
-    wProgressBar->setClassName("QProgressBar");
-    wProgressBar->setName(/* no i18n needed */ "Progress Bar");
-    wProgressBar->setNamePrefix(/* no i18n needed */ "progressBar");
-    wProgressBar->setDescription(/* no i18n needed */ "A progress indicator widget");
-    addClass(wProgressBar);
-
-    KFormDesigner::WidgetInfo *wLine = new KFormDesigner::WidgetInfo(this);
-    wLine->setIconName(KexiIconName("line-horizontal"));
-    wLine->setClassName("Line");
-    wLine->setName(xi18n("Line"));
-    wLine->setNamePrefix(
-        xi18nc("A prefix for identifiers of line widgets. Based on that, identifiers such as "
-            "line1, line2 are generated. "
-            "This string can be used to refer the widget object as variables in programming "
-            "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
-            "should start with lower case letter and if there are subsequent words, these should "
-            "start with upper case letter. Example: smallCamelCase. "
-            "Moreover, try to make this prefix as short as possible.",
-            "line"));
-    wLine->setDescription(xi18n("A line to be used as a separator"));
-    wLine->setAutoSaveProperties(QList<QByteArray>() << "orientation");
-    wLine->setInternalProperty("orientationSelectionPopup", true);
-    wLine->setInternalProperty("orientationSelectionPopup:horizontalIcon", KexiIconName("line-horizontal"));
-    wLine->setInternalProperty("orientationSelectionPopup:verticalIcon", KexiIconName("line-vertical"));
-    wLine->setInternalProperty("orientationSelectionPopup:horizontalText", xi18n("Insert &Horizontal Line"));
-    wLine->setInternalProperty("orientationSelectionPopup:verticalText", xi18n("Insert &Vertical Line"));
-    addClass(wLine);
-
-    KFormDesigner::WidgetInfo *wDate = new KFormDesigner::WidgetInfo(this);
-    wDate->setIconName(KexiIconName("dateedit"));
-    wDate->setClassName("QDateEdit");
-    wDate->addAlternateClassName("KDateWidget");
-    wDate->setIncludeFileName("qdateedit.h");
-    wDate->setName(/* no i18n needed */ "Date Widget");
-    wDate->setNamePrefix(/* no i18n needed */ "dateWidget");
-    wDate->setDescription(/* no i18n needed */ "A widget to input and display a date");
-    wDate->setAutoSaveProperties(QList<QByteArray>() << "date");
-    addClass(wDate);
-
-    KFormDesigner::WidgetInfo *wTime = new KFormDesigner::WidgetInfo(this);
-    wTime->setIconName(KexiIconName("timeedit"));
-    wTime->setClassName("QTimeEdit");
-    wTime->addAlternateClassName("KTimeWidget");
-    wTime->setIncludeFileName("qtimewidget.h");
-    wTime->setName(/* no i18n needed */ "Time Widget");
-    wTime->setNamePrefix(/* no i18n needed */ "timeWidget");
-    wTime->setDescription(/* no i18n needed */ "A widget to input and display a time");
-    wTime->setAutoSaveProperties(QList<QByteArray>() << "time");
-    addClass(wTime);
-
-    KFormDesigner::WidgetInfo *wDateTime = new KFormDesigner::WidgetInfo(this);
-    wDateTime->setIconName(KexiIconName("datetimeedit"));
-    wDateTime->setClassName("QDateTimeEdit");
-    wDateTime->addAlternateClassName("KDateTimeWidget");
-    wDateTime->setIncludeFileName("qdatetimewidget.h");
-    wDateTime->setName(/* no i18n needed */ "Date/Time Widget");
-    wDateTime->setNamePrefix(/* no i18n needed */ "dateTimeWidget");
-    wDateTime->setDescription(/* no i18n needed */ "A widget to input and display a time and a date");
-    wDateTime->setAutoSaveProperties(QList<QByteArray>() << "dateTime");
-    addClass(wDateTime);
-
-    setPropertyDescription("checkable", xi18nc("Property: Button is checkable", "On/Off"));
-    setPropertyDescription("autoRepeat", xi18nc("Property: Button", "Auto Repeat"));
-    setPropertyDescription("autoRepeatDelay", xi18nc("Property: Auto Repeat Button's Delay", "Auto Rep. Delay"));
-    setPropertyDescription("autoRepeatInterval", xi18nc("Property: Auto Repeat Button's Interval", "Auto Rep. Interval"));
-    // unused (too advanced) setPropertyDescription("autoDefault", xi18n("Auto Default"));
-    // unused (too advanced) setPropertyDescription("default", xi18nc("Property: Button is default", "Default"));
-    setPropertyDescription("flat", xi18nc("Property: Button is flat", "Flat"));
-    setPropertyDescription("echoMode",
-        xi18nc("Property: Echo mode for Line Edit widget eg. Normal, NoEcho, Password", "Echo Mode"));
-    setPropertyDescription("indent", xi18n("Indent"));
-    //line
-    setPropertyDescription("orientation", xi18n("Orientation"));
-    //checkbox
-    setPropertyDescription("checked", xi18nc("Property: Checked checkbox", "Checked"));
-    setPropertyDescription("tristate", xi18nc("Property: Tristate checkbox", "Tristate"));
-
-    //for labels
-    setPropertyDescription("textFormat", xi18n("Text Format"));
-    setValueDescription("PlainText", xi18nc("For Text Format", "Plain"));
-    setValueDescription("RichText", xi18nc("For Text Format", "Hypertext"));
-    setValueDescription("AutoText", xi18nc("For Text Format", "Auto"));
-    setValueDescription("LogText", xi18nc("For Text Format", "Log"));
-    setPropertyDescription("openExternalLinks", xi18nc("property: Can open external links in label", "Open Ext. Links"));
-
-    //QLineEdit
-    setPropertyDescription("placeholderText", xi18nc("Property: line edit's placeholder text", "Placeholder Text"));
-    setPropertyDescription("clearButtonEnabled", xi18nc("Property: Clear Button Enabled", "Clear Button"));
-    //for EchoMode
-    setPropertyDescription("passwordMode", xi18nc("Property: Password Mode for line edit", "Password Mode"));
-    setPropertyDescription("squeezedTextEnabled", xi18nc("Property: Squeezed Text Mode for line edit", "Squeezed Text"));
-
-    //KTextEdit
-    setPropertyDescription("tabStopWidth", xi18n("Tab Stop Width"));
-    setPropertyDescription("tabChangesFocus", xi18n("Tab Changes Focus"));
-    setPropertyDescription("wrapPolicy", xi18n("Word Wrap Policy"));
-    setValueDescription("AtWordBoundary", xi18nc("Property: For Word Wrap Policy", "At Word Boundary"));
-    setValueDescription("Anywhere", xi18nc("Property: For Word Wrap Policy", "Anywhere"));
-    setValueDescription("AtWordOrDocumentBoundary", xi18nc("Property: For Word Wrap Policy", "At Word Boundary If Possible"));
-    setPropertyDescription("wordWrap", xi18n("Word Wrapping"));
-    setPropertyDescription("wrapColumnOrWidth", xi18n("Word Wrap Position"));
-    setValueDescription("NoWrap", xi18nc("Property: For Word Wrap Position", "None"));
-    setValueDescription("WidgetWidth", xi18nc("Property: For Word Wrap Position", "Widget's Width"));
-    setValueDescription("FixedPixelWidth", xi18nc("Property: For Word Wrap Position", "In Pixels"));
-    setValueDescription("FixedColumnWidth", xi18nc("Property: For Word Wrap Position", "In Columns"));
-    setPropertyDescription("linkUnderline", xi18n("Links Underlined"));
-    setPropertyDescription("horizontalScrollBarPolicy", xi18n("Horizontal Scroll Bar"));
-    setPropertyDescription("verticalScrollBarPolicy", xi18n("Vertical Scroll Bar"));
-    //ScrollBarPolicy
-    setValueDescription("ScrollBarAsNeeded", xi18nc("Property: Show Scroll Bar As Needed", "As Needed"));
-    setValueDescription("ScrollBarAlwaysOff", xi18nc("Property: Scroll Bar Always Off", "Always Off"));
-    setValueDescription("ScrollBarAlwaysOn", xi18nc("Property: Scroll Bar Always On", "Always On"));
-    setPropertyDescription("acceptRichText", xi18nc("Property: Text Edit accepts rich text", "Rich Text"));
-    setPropertyDescription("HTML", xi18nc("Property: HTML value of text edit", "HTML"));
-
-    // --- containers ---
-
-    KFormDesigner::WidgetInfo *wTabWidget = new KFormDesigner::WidgetInfo(this);
-    wTabWidget->setIconName(KexiIconName("tabwidget"));
-    wTabWidget->setClassName("KFDTabWidget");
-    wTabWidget->addAlternateClassName("KTabWidget");
-    wTabWidget->addAlternateClassName("QTabWidget");
-    wTabWidget->setSavingName("QTabWidget");
-    wTabWidget->setIncludeFileName("qtabwidget.h");
-    wTabWidget->setName(xi18n("Tab Widget"));
-    wTabWidget->setNamePrefix(
-        xi18nc("A prefix for identifiers of tab widgets. Based on that, identifiers such as "
-              "tab1, tab2 are generated. "
-              "This string can be used to refer the widget object as variables in programming "
-              "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
-              "should start with lower case letter and if there are subsequent words, these should "
-              "start with upper case letter. Example: smallCamelCase. "
-              "Moreover, try to make this prefix as short as possible.",
-              "tabWidget"));
-    wTabWidget->setDescription(xi18n("A widget to display multiple pages using tabs"));
-    addClass(wTabWidget);
-
-    KFormDesigner::WidgetInfo *wWidget = new KFormDesigner::WidgetInfo(this);
-    wWidget->setIconName(KexiIconName("frame"));
-    wWidget->setClassName("QWidget");
-    wWidget->addAlternateClassName("ContainerWidget");
-    wWidget->setName(/* no i18n needed */ "Basic container");
-    wWidget->setNamePrefix(/* no i18n needed */ "container");
-    wWidget->setDescription(/* no i18n needed */ "An empty container with no frame");
-    addClass(wWidget);
-
-    KFormDesigner::WidgetInfo *wGroupBox = new KFormDesigner::WidgetInfo(this);
-    wGroupBox->setIconName(KexiIconName("groupbox"));
-    wGroupBox->setClassName("QGroupBox");
-    wGroupBox->addAlternateClassName("GroupBox");
-    wGroupBox->setName(xi18n("Group Box"));
-    wGroupBox->setNamePrefix(
-        xi18nc("A prefix for identifiers of group box widgets. Based on that, identifiers such as "
-              "groupBox1, groupBox2 are generated. "
-              "This string can be used to refer the widget object as variables in programming "
-              "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
-              "should start with lower case letter and if there are subsequent words, these should "
-              "start with upper case letter. Example: smallCamelCase. "
-              "Moreover, try to make this prefix as short as possible.",
-              "groupBox"));
-    wGroupBox->setDescription(xi18n("A container to group some widgets"));
-    addClass(wGroupBox);
-
-    KFormDesigner::WidgetInfo *wFrame = new KFormDesigner::WidgetInfo(this);
-    wFrame->setIconName(KexiIconName("frame"));
-    wFrame->setClassName("QFrame");
-    wFrame->setName(/* no i18n needed */ "Frame");
-    wFrame->setNamePrefix(/* no i18n needed */ "frame");
-    wFrame->setDescription(/* no i18n needed */ "A simple frame container");
-    addClass(wFrame);
-
-    //groupbox
-    setPropertyDescription("title", xi18nc("'Title' property for group box", "Title"));
-    setPropertyDescription("flat", xi18nc("'Flat' property for group box", "Flat"));
-
-    //tab widget
-    setPropertyDescription("tabBarAutoHide", xi18n("Auto-hide Tabs"));
-    setPropertyDescription("tabPosition", xi18n("Tab Position"));
-    setPropertyDescription("currentIndex", xi18nc("'Current page' property for tab widget", "Current Page"));
-    setPropertyDescription("tabShape", xi18n("Tab Shape"));
-    setPropertyDescription("elideMode", xi18nc("Tab Widget's Elide Mode property", "Elide Mode"));
-    setPropertyDescription("usesScrollButtons",
-                           xi18nc("Tab Widget's property: true if can use scroll buttons", "Scroll Buttons"));
-
-    setPropertyDescription("tabsClosable", xi18n("Closable Tabs"));
-    setPropertyDescription("movable", xi18n("Movable Tabs"));
-    setPropertyDescription("documentMode", xi18n("Document Mode"));
-
-    setValueDescription("Rounded", xi18nc("Property value for Tab Shape", "Rounded"));
-    setValueDescription("Triangular", xi18nc("Property value for Tab Shape", "Triangular"));
-}
-
-KexiStandardFormWidgetsFactory::~KexiStandardFormWidgetsFactory()
-{
-}
-
-QWidget* KexiStandardFormWidgetsFactory::createWidget(const QByteArray &c, QWidget *p, const char *n,
-                                                      KFormDesigner::Container *container,
-                                                      CreateWidgetOptions options)
-{
-    QWidget *w = 0;
-    bool createContainer = false;
-    QString text(container->form()->library()->textForWidgetName(n, c));
-    if (c == "QLabel") {
-        w = new QLabel(text, p);
-    } else if (c == "KexiPictureLabel") {
-        w = new KexiPictureLabel(koDesktopIcon("image-x-generic"), p);
-    } else if (c == "QLineEdit") {
-        w = new QLineEdit(p);
-    } else if (c == "QPushButton") {
-        w = new QPushButton(text, p);
-    } else if (c == "QRadioButton") {
-        w = new QRadioButton(text, p);
-    } else if (c == "QCheckBox") {
-        w = new QCheckBox(text, p);
-    } else if (c == "KIntSpinBox") {
-        w = new QSpinBox(p);
-    } else if (c == "KComboBox") {
-        w = new KComboBox(p);
-    } else if (c == "KTextEdit") {
-        w = new KTextEdit(text, p);
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-    } else if (c == "QTreeWidget") {
-        QTreeWidget *tw = new QTreeWidget(p);
-        w = tw;
-        if (container->form()->interactiveMode()) {
-            tw->setColumnCount(1);
-            tw->setHeaderItem(new QTreeWidetItem(tw));
-            tw->headerItem()->setText(1, futureI18n("Column 1"));
-        }
-        lw->setRootIsDecorated(true);
-#endif
-    } else if (c == "QSlider") {
-        w = new QSlider(Qt::Horizontal, p);
-    } else if (c == "QProgressBar") {
-        w = new QProgressBar(p);
-    } else if (c == "KDateWidget" || c == "QDateEdit") {
-        w = new QDateEdit(QDate::currentDate(), p);
-    } else if (c == "KTimeWidget" || c == "QTimeEdit") {
-        w = new QTimeEdit(QTime::currentTime(), p);
-    } else if (c == "KDateTimeWidget" || c == "QDateTimeEdit") {
-        w = new QDateTimeEdit(QDateTime::currentDateTime(), p);
-    } else if (c == "Line") {
-        w = new Line(options & WidgetFactory::VerticalOrientation
-                     ? Qt::Vertical : Qt::Horizontal, p);
-    } // --- containers ---
-    else if (c == "KFDTabWidget") {
-        KFDTabWidget *tab = new KFDTabWidget(container, p);
-        w = tab;
-#if defined(USE_KTabWidget)
-        tab->setTabReorderingEnabled(true);
-        connect(tab, SIGNAL(movedTab(int,int)), this, SLOT(reorderTabs(int,int)));
-#endif
-        //qDebug() << "Creating ObjectTreeItem:";
-        container->form()->objectTree()->addItem(container->objectTree(),
-                new KFormDesigner::ObjectTreeItem(
-                    container->form()->library()->displayName(c), n, tab, container));
-    } else if (c == "QWidget") {
-        w = new ContainerWidget(p);
-        w->setObjectName(n);
-        new KFormDesigner::Container(container, w, p);
-        return w;
-    } else if (c == "QGroupBox") {
-        QString text = container->form()->library()->textForWidgetName(n, c);
-        w = new GroupBox(text, p);
-        createContainer = true;
-    } else if (c == "QFrame") {
-        QFrame *frm = new QFrame(p);
-        w = frm;
-        frm->setLineWidth(2);
-        frm->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
-        createContainer = true;
-    } else if (c == "QStackedWidget" || /* compat */ c == "QWidgetStack") {
-        QStackedWidget *stack = new QStackedWidget(p);
-        w = stack;
-        stack->setLineWidth(2);
-        stack->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
-        //qDebug() << "Creating ObjectTreeItem:";
-        container->form()->objectTree()->addItem(container->objectTree(),
-                new KFormDesigner::ObjectTreeItem(
-                    container->form()->library()->displayName(c), n, stack, container));
-
-        if (container->form()->interactiveMode()) {
-            AddStackPageAction(container, stack, 0).trigger(); // addStackPage();
-        }
-    } else if (c == "HBox") {
-        w = new HBox(p);
-        createContainer = true;
-    } else if (c == "VBox") {
-        w = new VBox(p);
-        createContainer = true;
-    } else if (c == "Grid") {
-        w = new Grid(p);
-        createContainer = true;
-    } else if (c == "HFlow") {
-        w = new HFlow(p);
-        createContainer = true;
-    } else if (c == "VFlow") {
-        w = new VFlow(p);
-        createContainer = true;
-    }
-
-    if (w) {
-        w->setObjectName(n);
-        qDebug() << w << w->objectName() << "created";
-    }
-    if (createContainer) {
-        (void)new KFormDesigner::Container(container, w, container);
-    }
-    if (c == "KFDTabWidget") {
-        // if we are loading, don't add this tab
-        if (container->form()->interactiveMode()) {
-            TabWidgetBase *tab = qobject_cast<TabWidgetBase*>(w);
-            AddTabAction(container, tab, 0).slotTriggered();
-        }
-    }
-    return w;
-}
-
-bool KexiStandardFormWidgetsFactory::previewWidget(const QByteArray &classname,
-                                QWidget *widget, KFormDesigner::Container *container)
-{
-    if (classname == "QStackedWidget" || /* compat */ classname == "QWidgetStack") {
-        QStackedWidget *stack = qobject_cast<QStackedWidget*>(widget);
-        KFormDesigner::ObjectTreeItem *tree = container->form()->objectTree()->lookup(
-            widget->objectName());
-        if (!tree->modifiedProperties()->contains("frameShape"))
-            stack->setFrameStyle(QFrame::NoFrame);
-    }
-    return true;
-}
-
-bool KexiStandardFormWidgetsFactory::createMenuActions(const QByteArray &classname, QWidget *w,
-                                                       QMenu *menu, KFormDesigner::Container *container)
-{
-    QWidget *pw = w->parentWidget();
-    if ((classname == "QLabel") || (classname == "KTextEdit")) {
-        menu->addAction( new EditRichTextAction(container, w, menu, this) );
-        return true;
-    }
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-    else if (classname == "QTreeWidget") {
-        menu->addAction(koIcon("document-properties"), xi18n("Edit Contents of List Widget"),
-            this, SLOT(editListContents()));
-        return true;
-    }
-#endif
-    else if (classname == "KFDTabWidget" || pw->parentWidget()->inherits("QTabWidget")) {
-//! @todo KEXI3 port this: setWidget(pw->parentWidget(), m_container->toplevel());
-#if 0
-        if (pw->parentWidget()->inherits("QTabWidget")) {
-            setWidget(pw->parentWidget(), m_container->toplevel());
-        }
-#endif
-
-        TabWidgetBase *tab = qobject_cast<TabWidgetBase*>(w);
-        if (tab) {
-            menu->addAction( new AddTabAction(container, tab, menu) );
-            menu->addAction( new RenameTabAction(container, tab, menu) );
-            menu->addAction( new RemoveTabAction(container, tab, menu) );
-        }
-        return true;
-    }
-    else if (    (KexiUtils::objectIsA(pw, "QStackedWidget") || /* compat */ KexiUtils::objectIsA(pw, "QWidgetStack"))
-              && !pw->parentWidget()->inherits("QTabWidget")
-            )
-    {
-        QStackedWidget *stack = qobject_cast<QStackedWidget*>(pw);
-//! @todo KEXI3 port this: setWidget( pw, container->form()->objectTree()->lookup(stack->objectName())->parent()->container() );
-#if 0
-        setWidget(
-            pw,
-            container->form()->objectTree()->lookup(stack->objectName())->parent()->container()
-        );
-#endif
-        KFormDesigner::Container *parentContainer
-            = container->form()->objectTree()->lookup(stack->objectName())->parent()->container();
-        menu->addAction( new AddStackPageAction(parentContainer, pw, menu) );
-        menu->addAction( new RemoveStackPageAction(parentContainer, pw, menu) );
-        menu->addAction( new GoToStackPageAction(GoToStackPageAction::Previous, parentContainer, pw, menu) );
-        menu->addAction( new GoToStackPageAction(GoToStackPageAction::Next, parentContainer, pw, menu) );
-        return true;
-    }
-    return false;
-}
-
-bool KexiStandardFormWidgetsFactory::startInlineEditing(InlineEditorCreationArguments& args)
-{
-    if (args.classname == "QLineEdit") {
-        QLineEdit *lineedit = static_cast<QLineEdit*>(args.widget);
-        args.text = lineedit->text();
-        args.alignment = lineedit->alignment();
-        args.useFrame = true;
-        return true;
-    }
-    else if (args.widget->inherits("QLabel")) {
-        QLabel *label = static_cast<QLabel*>(args.widget);
-        if (label->textFormat() == Qt::RichText) {
-            args.execute = false;
-            EditRichTextAction(args.container, label, 0, this).trigger();
-//! @todo
-        } else {
-            args.text = label->text();
-            args.alignment = label->alignment();
-        }
-        return true;
-    }
-    else if (args.classname == "QPushButton") {
-        QPushButton *push = static_cast<QPushButton*>(args.widget);
-        QStyleOption option;
-        option.initFrom(push);
-        args.text = push->text();
-        const QRect r(push->style()->subElementRect(
-                          QStyle::SE_PushButtonContents, &option, push));
-        args.geometry = QRect(push->x() + r.x(), push->y() + r.y(), r.width(), r.height());
-//! @todo this is typical alignment, can we get actual from the style?
-        args.alignment = Qt::AlignCenter;
-        args.transparentBackground = true;
-        return true;
-    }
-    else if (args.classname == "QRadioButton") {
-        QRadioButton *radio = static_cast<QRadioButton*>(args.widget);
-        QStyleOption option;
-        option.initFrom(radio);
-        args.text = radio->text();
-        const QRect r(radio->style()->subElementRect(
-                          QStyle::SE_RadioButtonContents, &option, radio));
-        args.geometry = QRect(
-            radio->x() + r.x(), radio->y() + r.y(), r.width(), r.height());
-        return true;
-    }
-    else if (args.classname == "QCheckBox") {
-        QCheckBox *check = static_cast<QCheckBox*>(args.widget);
-        QStyleOption option;
-        option.initFrom(check);
-        const QRect r(args.widget->style()->subElementRect(
-                          QStyle::SE_CheckBoxContents, &option, check));
-        args.geometry = QRect(
-            check->x() + r.x(), check->y() + r.y(), r.width(), r.height());
-        return true;
-    } else if (args.classname == "KComboBox" || args.classname == "QComboBox") {
-        QStringList list;
-        KComboBox *combo = qobject_cast<KComboBox*>(args.widget);
-        for (int i = 0; i < combo->count(); i++) {
-            list.append(combo->itemText(i));
-        }
-        args.execute = false;
-        if (editList(args.widget, list)) {
-            qobject_cast<KComboBox*>(args.widget)->clear();
-            qobject_cast<KComboBox*>(args.widget)->addItems(list);
-        }
-        return true;
-    }
-    else if (   args.classname == "KTextEdit" || args.classname == "KDateTimeWidget"
-             || args.classname == "KTimeWidget" || args.classname == "KDateWidget"
-             || args.classname == "KIntSpinBox")
-    {
-        args.execute = false;
-        disableFilter(args.widget, args.container);
-        return true;
-    }
-    return false;
-}
-
-bool KexiStandardFormWidgetsFactory::clearWidgetContent(const QByteArray &classname, QWidget *w)
-{
-    if (classname == "QLineEdit")
-        qobject_cast<QLineEdit*>(w)->clear();
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-    else if (classname == "QTreeWidget")
-        qobject_cast<QTreeWidget*>(w)->clear();
-#endif
-    else if (classname == "KComboBox")
-        qobject_cast<KComboBox*>(w)->clear();
-    else if (classname == "KTextEdit")
-        qobject_cast<KTextEdit*>(w)->clear();
-    else
-        return false;
-    return true;
-}
-
-bool KexiStandardFormWidgetsFactory::changeInlineText(KFormDesigner::Form *form, QWidget *widget,
-                                                      const QString &text, QString &oldText)
-{
-    const QByteArray n(widget->metaObject()->className());
-    if (n == "KIntSpinBox") {
-        oldText = QString::number(qobject_cast<QSpinBox*>(widget)->value());
-        qobject_cast<QSpinBox*>(widget)->setValue(text.toInt());
-    }
-    else {
-        oldText = widget->property("text").toString();
-        changeProperty(form, widget, "text", text);
-    }
-    return true;
-}
-
-void KexiStandardFormWidgetsFactory::resizeEditor(QWidget *editor, QWidget *widget,
-                                                  const QByteArray &classname)
-{
-    QSize s = widget->size();
-    QPoint p = widget->pos();
-    QRect r;
-
-    if (classname == "QRadioButton") {
-        QStyleOption option;
-        option.initFrom(widget);
-        r = widget->style()->subElementRect(
-                QStyle::SE_RadioButtonContents, &option, widget);
-        p += r.topLeft();
-        s.setWidth(r.width());
-    } else if (classname == "QCheckBox") {
-        QStyleOption option;
-        option.initFrom(widget);
-        r = widget->style()->subElementRect(
-                QStyle::SE_CheckBoxContents, &option, widget);
-        p += r.topLeft();
-        s.setWidth(r.width());
-    } else if (classname == "QPushButton") {
-        QStyleOption option;
-        option.initFrom(widget);
-        r = widget->style()->subElementRect(
-                QStyle::SE_PushButtonContents, &option, widget);
-        p += r.topLeft();
-        s = r.size();
-    }
-
-    editor->resize(s);
-    editor->move(p);
-
-    //! @todo KEXI3
-    /* from ContainerFactory::resizeEditor(QWidget *editor, QWidget *widget, const QByteArray &):
-        QSize s = widget->size();
-        editor->move(widget->x() + 2, widget->y() - 5);
-        editor->resize(s.width() - 20, widget->fontMetrics().height() + 10); */
-}
-
-bool KexiStandardFormWidgetsFactory::saveSpecialProperty(const QByteArray &classname,
-                                      const QString &name, const QVariant &,
-                                      QWidget *w, QDomElement &parentNode, QDomDocument &domDoc)
-{
-    if (name == "list_items" && classname == "KComboBox") {
-        KComboBox *combo = qobject_cast<KComboBox*>(w);
-        for (int i = 0; i < combo->count(); i++) {
-            QDomElement item = domDoc.createElement("item");
-            KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", combo->itemText(i));
-            parentNode.appendChild(item);
-        }
-        return true;
-    }
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-    else if (name == "list_contents" && classname == "QTreeWidget") {
-        QTreeWidget *treewidget = qobject_cast<QTreeWidget*>(w);
-        // First we save the columns
-        QTreeWidgetItem *headerItem = treewidget->headerItem();
-        if (headerItem) {
-            for (int i = 0; i < treewidget->columnCount(); i++) {
-                QDomElement item = domDoc.createElement("column");
-                KFormDesigner::FormIO::savePropertyElement(
-                    item, domDoc, "property", "text", headerItem->text(i));
-                KFormDesigner::FormIO::savePropertyElement(
-                    item, domDoc, "property", "width", treewidget->columnWidth(i));
-                KFormDesigner::FormIO::savePropertyElement(
-                    item, domDoc, "property", "resizable", treewidget->header()->isResizeEnabled(i));
-                KFormDesigner::FormIO::savePropertyElement(
-                    item, domDoc, "property", "clickable", treewidget->header()->isClickEnabled(i));
-                KFormDesigner::FormIO::savePropertyElement(
-                    item, domDoc, "property", "fullwidth", treewidget->header()->isStretchEnabled(i));
-                parentNode.appendChild(item);
-            }
-        }
-        // Then we save the list view items
-        QTreeWidgetItem *item = listwidget->firstChild();
-        while (item) {
-            saveListItem(item, parentNode, domDoc);
-            item = item->nextSibling();
-        }
-        return true;
-    }
-#endif
-    else if ((name == "title") && (w->parentWidget()->parentWidget()->inherits("QTabWidget"))) {
-        TabWidgetBase *tab = qobject_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
-        KFormDesigner::FormIO::savePropertyElement(
-            parentNode, domDoc, "attribute", "title", tab->tabText(tab->indexOf(w)));
-    } else if ((name == "stackIndex")
-        && (KexiUtils::objectIsA(w->parentWidget(), "QStackedWidget")
-            || /*compat*/ KexiUtils::objectIsA(w->parentWidget(), "QWidgetStack")))
-    {
-        QStackedWidget *stack = qobject_cast<QStackedWidget*>(w->parentWidget());
-        KFormDesigner::FormIO::savePropertyElement(
-            parentNode, domDoc, "attribute", "stackIndex", stack->indexOf(w));
-    } else
-        return false;
-    return true;
-}
-
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-void
-KexiStandardFormWidgetsFactory::saveListItem(QListWidgetItem *item,
-                               QDomNode &parentNode, QDomDocument &domDoc)
-{
-    QDomElement element = domDoc.createElement("item");
-    parentNode.appendChild(element);
-
-    // We save the text of each column
-    for (int i = 0; i < item->listWidget()->columns(); i++) {
-        KFormDesigner::FormIO::savePropertyElement(
-            element, domDoc, "property", "text", item->text(i));
-    }
-
-    // Then we save every sub items
-    QListWidgetItem *child = item->firstChild();
-    while (child) {
-        saveListItem(child, element, domDoc);
-        child = child->nextSibling();
-    }
-}
-#endif
-
-bool KexiStandardFormWidgetsFactory::readSpecialProperty(const QByteArray &classname,
-                                                         QDomElement &node, QWidget *w,
-                                                         KFormDesigner::ObjectTreeItem *item)
-{
-    const QString tag( node.tagName() );
-    const QString name( node.attribute("name") );
-    KFormDesigner::Form *form = item->container()
-            ? item->container()->form() : item->parent()->container()->form();
-
-    if ((tag == "item") && (classname == "KComboBox")) {
-        KComboBox *combo = qobject_cast<KComboBox*>(w);
-        QVariant val = KFormDesigner::FormIO::readPropertyValue(
-                    form, node.firstChild().firstChild(), w, name);
-        if (val.canConvert(QVariant::Pixmap))
-            combo->addItem(val.value<QPixmap>(), QString());
-        else
-            combo->addItem(val.toString());
-        return true;
-    }
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-    else if (tag == "column" && classname == "QTreeWidget") {
-        QTreeWidget *tw = qobject_cast<QTreeWidget*>(w);
-        int id = 0;
-        for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
-            QString prop = n.toElement().attribute("name");
-            QVariant val = KFormDesigner::FormIO::readPropertyValue(n.firstChild(), w, name);
-            if (prop == "text")
-                id = tw->addColumn(val.toString());
-            else if (prop == "width")
-                tw->setColumnWidth(id, val.toInt());
-            else if (prop == "resizable")
-                tw->header()->setResizeEnabled(val.toBool(), id);
-            else if (prop == "clickable")
-                tw->header()->setClickEnabled(val.toBool(), id);
-            else if (prop == "fullwidth")
-                tw->header()->setStretchEnabled(val.toBool(), id);
-        }
-        return true;
-    }
-    else if (tag == "item" && classname == "QTreeWidget") {
-        QTreeWidget *tw = qobject_cast<QTreeWidget*>(w);
-        readListItem(node, 0, tw);
-        return true;
-    }
-#endif
-    else if ((name == "title") && (item->parent()->widget()->inherits("QTabWidget"))) {
-        TabWidgetBase *tab = qobject_cast<TabWidgetBase*>(w->parentWidget());
-        tab->addTab(w, node.firstChild().toElement().text());
-        item->addModifiedProperty("title", node.firstChild().toElement().text());
-        return true;
-    }
-    else if (name == "stackIndex"
-        && (KexiUtils::objectIsA(w->parentWidget(), "QStackedWidget")
-            || /*compat*/ KexiUtils::objectIsA(w->parentWidget(), "QWidgetStack")))
-    {
-        QStackedWidget *stack = qobject_cast<QStackedWidget*>(w->parentWidget());
-        int index = KFormDesigner::FormIO::readPropertyValue(form, node.firstChild(), w, name).toInt();
-        stack->insertWidget(index, w);
-        stack->setCurrentWidget(w);
-        item->addModifiedProperty("stackIndex", index);
-        return true;
-    }
-    return false;
-}
-
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-void
-KexiStandardFormWidgetsFactory::readTreeItem(
-    QDomElement &node, QTreeWidgetItem *parent, QTreeWidget *treewidget)
-{
-    QTreeWidgetItem *item;
-    if (parent)
-        item = new QTreeWidgetItem(parent);
-    else
-        item = new QTreeWidgetItem(treewidget);
-
-    // We need to move the item at the end of the list
-    QTreeWidgetItem *last;
-    if (parent)
-        last = parent->firstChild();
-    else
-        last = treewidget->firstChild();
-
-    while (last->nextSibling())
-        last = last->nextSibling();
-    item->moveItem(last);
-
-    int i = 0;
-    for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
-        QDomElement childEl = n.toElement();
-        QString prop = childEl.attribute("name");
-        QString tag = childEl.tagName();
-
-        // We read sub items
-        if (tag == "item") {
-            item->setOpen(true);
-            readListItem(childEl, item, treewidget);
-        }
-        // and column texts
-        else if (tag == "property" && prop == "text") {
-            QVariant val = KFormDesigner::FormIO::readPropertyValue(
-                n.firstChild(), treewidget, "item");
-            item->setText(i, val.toString());
-            i++;
-        }
-    }
-}
-#endif
-
-bool KexiStandardFormWidgetsFactory::isPropertyVisibleInternal(const QByteArray &classname,
-                                                               QWidget *w, const QByteArray &property,
-                                                               bool isTopLevel)
-{
-    bool ok = true;
-    if (classname == "FormWidgetBase") {
-        if (property == "windowIconText"
-                || property == "geometry" /*nonsense for toplevel widget*/)
-        {
-            return false;
-        }
-    }
-    else if (classname == "CustomWidget") {
-    }
-    else if (classname == "KexiPictureLabel") {
-        if (   property == "text" || property == "indent"
-            || property == "textFormat" || property == "font"
-            || property == "alignment")
-        {
-            return false;
-        }
-    } else if (classname == "QLabel") {
-        if (property == "pixmap")
-            return false;
-    } else if (classname == "QLineEdit") {
-        if (property == "vAlign")
-            return false;
-    } else if (classname == "KTextEdit")
-        ok = KFormDesigner::WidgetFactory::advancedPropertiesVisible() ||
-             (   property != "undoDepth"
-              && property != "undoRedoEnabled" //always true!
-              && property != "dragAutoScroll" //always true!
-              && property != "overwriteMode" //always false!
-              && property != "resizePolicy"
-              && property != "autoFormatting" //too complex
-#ifndef KEXI_SHOW_UNFINISHED
-              && property != "paper"
-#endif
-             );
-    else if (classname == "Line") {
-        if ((property == "frameShape") || (property == "font") || (property == "margin"))
-            return false;
-    } else if (classname == "QCheckBox") {
-        ok = KFormDesigner::WidgetFactory::advancedPropertiesVisible() || (property != "autoRepeat");
-    } else if (classname == "QRadioButton") {
-        ok = KFormDesigner::WidgetFactory::advancedPropertiesVisible() || (property != "autoRepeat");
-    } else if (classname == "QPushButton") {
-//! @todo reenable autoDefault / default if the top level window is dialog...
-        ok = KFormDesigner::WidgetFactory::advancedPropertiesVisible() || (property != "autoDefault" && property != "default");
-    }
-    else if (   classname == "HBox" || classname == "VBox" || classname == "Grid"
-             || classname == "HFlow" || classname == "VFlow")
-    {
-        return property == "objectName" || property == "geometry";
-    }
-    else if (classname == "QGroupBox") {
-        ok =
-#ifndef KEXI_SHOW_UNFINISHED
-            /*! @todo Hidden for now in Kexi. "checkable" and "checked" props need adding
-            a fake properties which will allow to properly work in design mode, otherwise
-            child widgets become frozen when checked==true */
-            (KFormDesigner::WidgetFactory::advancedPropertiesVisible() || (property != "checkable" && property != "checked")) &&
-#endif
-            true;
-    } else if (classname == "KFDTabWidget") {
-        ok = (KFormDesigner::WidgetFactory::advancedPropertiesVisible()
-              || (property != "tabReorderingEnabled" && property != "hoverCloseButton"
-                  && property != "hoverCloseButtonDelayed"));
-    }
-    return ok && WidgetFactory::isPropertyVisibleInternal(classname, w, property, isTopLevel);
-}
-
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-void
-KexiStandardFormWidgetsFactory::editListContents()
-{
-    if (widget()->inherits("QTreeWidget"))
-        editTreeWidget(qobject_cast<QTreeWidget*>(widget()));
-}
-#endif
-
-void KexiStandardFormWidgetsFactory::setPropertyOptions(KPropertySet& set,
-                                                        const KFormDesigner::WidgetInfo& info,
-                                                        QWidget *w)
-{
-    Q_UNUSED(info);
-    Q_UNUSED(w);
-
-    if (set.contains("indent")) {
-        set["indent"].setOption("min", -1);
-        set["indent"].setOption("minValueText", xi18nc("default indent value", "default"));
-    }
-}
-
-void KexiStandardFormWidgetsFactory::reorderTabs(int oldpos, int newpos)
-{
-    KFDTabWidget *tabWidget = qobject_cast<KFDTabWidget*>(sender());
-    KFormDesigner::ObjectTreeItem *tab
-            = tabWidget->container()->form()->objectTree()->lookup(tabWidget->objectName());
-    if (!tab)
-        return;
-
-    tab->children()->move(oldpos, newpos);
-}
-
-KFormDesigner::ObjectTreeItem* KexiStandardFormWidgetsFactory::selectableItem(
-                                                KFormDesigner::ObjectTreeItem* item)
-{
-    if (item->parent() && item->parent()->widget()) {
-        if (qobject_cast<QTabWidget*>(item->parent()->widget())) {
-            // tab widget's page
-            return item->parent();
-        }
-    }
-    return item;
-}
-
-#include "KexiStandardFormWidgetsFactory.moc"
diff --git a/src/formeditor/factories/KexiStandardFormWidgetsFactory.h b/src/formeditor/factories/KexiStandardFormWidgetsFactory.h
deleted file mode 100644
index 28e9ef969..000000000
--- a/src/formeditor/factories/KexiStandardFormWidgetsFactory.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2003 by Lucijan Busch <lucijan@kde.org>
-   Copyright (C) 2004 Cedric Pasteur <cedric.pasteur@free.fr>
-   Copyright (C) 2009 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 KEXISTANDARDFORMWIDGETSFACTORY_H
-#define KEXISTANDARDFORMWIDGETSFACTORY_H
-
-#include <QFrame>
-#include <QPixmap>
-#include <QLabel>
-#include <QMenu>
-
-#include "widgetfactory.h"
-#include "container.h"
-
-class QTreeWidgetItem;
-class QTreeWidget;
-
-class KPropertySet;
-
-//! Factory for all basic widgets, including Spring (not containers)
-class KexiStandardFormWidgetsFactory : public KFormDesigner::WidgetFactory
-{
-    Q_OBJECT
-
-public:
-    KexiStandardFormWidgetsFactory(QObject *parent, const QVariantList &args);
-    ~KexiStandardFormWidgetsFactory();
-
-    virtual QWidget* createWidget(const QByteArray &classname, QWidget *parent, const char *name,
-                                  KFormDesigner::Container *container,
-                                  CreateWidgetOptions options = DefaultOptions);
-
-    virtual bool createMenuActions(const QByteArray &classname, QWidget *w,
-                                   QMenu *menu, KFormDesigner::Container *container);
-    virtual bool startInlineEditing(InlineEditorCreationArguments& args);
-    virtual bool previewWidget(const QByteArray &classname, QWidget *widget,
-                               KFormDesigner::Container *container);
-    virtual bool clearWidgetContent(const QByteArray &classname, QWidget *w);
-
-    virtual bool saveSpecialProperty(const QByteArray &classname,
-                                     const QString &name, const QVariant &value, QWidget *w,
-                                     QDomElement &parentNode, QDomDocument &parent);
-    virtual bool readSpecialProperty(const QByteArray &classname, QDomElement &node,
-                                     QWidget *w, KFormDesigner::ObjectTreeItem *item);
-
-    virtual void setPropertyOptions(KPropertySet& set, const KFormDesigner::WidgetInfo& info, QWidget *w);
-
-    //! Moved into public for EditRichTextAction
-    bool editRichText(QWidget *w, QString &text) const { return KFormDesigner::WidgetFactory::editRichText(w, text); }
-
-    //! Moved into public for EditRichTextAction
-    void changeProperty(KFormDesigner::Form *form, QWidget *widget, const char *name,
-        const QVariant &value) { KFormDesigner::WidgetFactory::changeProperty(form, widget, name, value); }
-
-public Q_SLOTS:
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-    void  editListContents();
-#endif
-protected Q_SLOTS:
-    void reorderTabs(int oldpos, int newpos);
-
-protected:
-    KFormDesigner::ObjectTreeItem* selectableItem(KFormDesigner::ObjectTreeItem* item);
-    virtual bool isPropertyVisibleInternal(const QByteArray &classname, QWidget *w,
-                                           const QByteArray &property, bool isTopLevel);
-    virtual bool changeInlineText(KFormDesigner::Form *form, QWidget *widget,
-                                  const QString &text, QString &oldText);
-    virtual void resizeEditor(QWidget *editor, QWidget *widget, const QByteArray &classname);
-#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
-    void saveTreeItem(QTreeWidgetItem *item, QDomNode &parentNode, QDomDocument &domDoc);
-    void readTreeItem(QDomElement &node, QTreeWidgetItem *parent, QTreeWidget *treewidget);
-#endif
-};
-
-#endif
diff --git a/src/formeditor/factories/kexiforms_standardwidgetsplugin.desktop b/src/formeditor/factories/kexiforms_standardwidgetsplugin.desktop
deleted file mode 100644
index 56c24c3b6..000000000
--- a/src/formeditor/factories/kexiforms_standardwidgetsplugin.desktop
+++ /dev/null
@@ -1,53 +0,0 @@
-[Desktop Entry]
-Name=Standard Widgets
-Name[ca]=Estris estàndards
-Name[ca@valencia]=Estris estàndards
-Name[cs]=Standardní widgety
-Name[de]=Standardbedienelemente
-Name[en_GB]=Standard Widgets
-Name[es]=Elementos gráficos estándares
-Name[fi]=Vakioelementit
-Name[gl]=Trebellos etándar
-Name[it]=Oggetti standard
-Name[nl]=Standaardwidgets
-Name[pl]=Standardowe elementy interfejsu
-Name[pt]=Elementos-Padrão
-Name[pt_BR]=Elementos padrão
-Name[sk]=Štandardné widgety
-Name[sv]=Standardkomponenter
-Name[uk]=Стандартні віджети
-Name[x-test]=xxStandard Widgetsxx
-Comment=Kexi plugin providing standard form widgets
-Comment[ca]=Connector del Kexi que proporciona estris estàndard de formularis
-Comment[ca@valencia]=Connector del Kexi que proporciona estris estàndard de formularis
-Comment[de]=Kexi-Modul, das Standard-Formularelemente bereitstellt
-Comment[en_GB]=Kexi plugin providing standard form widgets
-Comment[es]=Complemento de Kexi que proporciona elementos gráficos estándares para formularios
-Comment[fi]=Kexi-liitännäinen, joka tarjoaa vakiolomake-elementit
-Comment[gl]=Complemento de Kexi que fornece trebellos estándar para formularios.
-Comment[it]=Estensione che fornisce oggetti dei moduli standard di Kexi
-Comment[nl]=Kexi-plug-in levert standaard formulierwidgets
-Comment[pl]=Wtyczka Kexi dostarczająca standarowe formularze
-Comment[pt]='Plugin' do Kexi que oferece elementos gráficos de formulários
-Comment[pt_BR]=Plugin do Kexi que oferece elementos gráficos de formulários
-Comment[sk]=Kexi plugin poskytujúci štandardné widgety formulárov
-Comment[sv]=Kexi insticksprogram som tillhandahåller standardkomponenter för formulär
-Comment[uk]=Додаток до Kexi, що забезпечує роботу форми стандартних віджетів
-Comment[x-test]=xxKexi plugin providing standard form widgetsxx
-Type=Service
-Icon=form
-Encoding=UTF-8
-
-X-KDE-Library=kexiforms_standardwidgetsplugin
-X-KDE-ServiceTypes=Kexi/FormWidgets
-X-KDE-PluginInfo-Author=Kexi Team
-X-KDE-PluginInfo-Email=kexi@kde.org
-X-KDE-PluginInfo-Name=org.kexi-project.form.widgets.standard
-X-KDE-PluginInfo-Version=3.0
-X-KDE-PluginInfo-Website=http://kexi-project.org
-X-KDE-PluginInfo-Category=
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
-
-X-Kexi-FormWidgetsFactoryGroup=
diff --git a/src/formeditor/widgetlibrary.cpp b/src/formeditor/widgetlibrary.cpp
index a53b5b309..8a73ee07d 100644
--- a/src/formeditor/widgetlibrary.cpp
+++ b/src/formeditor/widgetlibrary.cpp
@@ -1,772 +1,782 @@
 /* This file is part of the KDE project
    Copyright (C) 2003 Lucijan Busch <lucijan@gmx.at>
    Copyright (C) 2004 Cedric Pasteur <cedric.pasteur@free.fr>
    Copyright (C) 2004-2015 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 "widgetlibrary.h"
 #include <KexiIcon.h>
 #include "WidgetInfo.h"
 #include "widgetfactory.h"
 #include "libactionwidget.h"
 #include "container.h"
 #include "form.h"
 #include "formIO.h"
 #include "FormWidgetInterface.h"
 #include "objecttree.h"
 #include "KexiJsonTrader.h"
 #include "KexiFormWidgetsPluginMetaData.h"
 #include "KexiVersion.h"
 #include <core/kexiguimsghandler.h>
+#include <main/KexiRegisterResource_p.h>
 
 #include <KActionCollection>
 #include <KLocalizedString>
 
 #include <QDomDocument>
 #include <QMenu>
 #include <QDebug>
 
 namespace KFormDesigner
 {
 
 Q_GLOBAL_STATIC_WITH_ARGS(KexiJsonTrader, KexiFormWidgetsPluginTrader_instance, (KEXI_BASE_NAME_LOWER "/forms/widgets"))
 
 //! @internal
 class Q_DECL_HIDDEN WidgetLibrary::Private
 {
 public:
     Private(WidgetLibrary *library, const QStringList& supportedFactoryGroups)
             : showAdvancedProperties(true)
             , q(library)
             , m_couldNotFindAnyFormWidgetPluginsErrorDisplayed(false)
             , m_supportedFactoryGroups(supportedFactoryGroups.toSet())
             , m_lookupDone(false)
             , m_loadFactoriesDone(false)
     {
         q->setMessageHandler(&messageHandler);
         m_advancedProperties.insert("acceptDrops");
         m_advancedProperties.insert("accessibleDescription");
         m_advancedProperties.insert("accessibleName");
         m_advancedProperties.insert("autoMask");
         m_advancedProperties.insert("backgroundOrigin");
         m_advancedProperties.insert("backgroundMode");//this is rather useless
         m_advancedProperties.insert("baseSize");
         m_advancedProperties.insert("contextMenuEnabled");
         m_advancedProperties.insert("contextMenuPolicy");
         m_advancedProperties.insert("cursorPosition");
         m_advancedProperties.insert("cursorMoveStyle");
         m_advancedProperties.insert("dragEnabled");
         m_advancedProperties.insert("enableSqueezedText");
         m_advancedProperties.insert("layout");// too large risk to break things
         m_advancedProperties.insert("layoutDirection");
         m_advancedProperties.insert("locale");
         m_advancedProperties.insert("mouseTracking");
 /*! @todo: reenable */ m_advancedProperties.insert("palette");
         m_advancedProperties.insert("sizeAdjustPolicy"); //QAbstractScrollArea
         m_advancedProperties.insert("sizeIncrement");
         m_advancedProperties.insert("sizePolicy");
         m_advancedProperties.insert("statusTip");
         m_advancedProperties.insert("toolTipDuration");
         m_advancedProperties.insert("trapEnterKeyEvent");
         m_advancedProperties.insert("windowModality");
         m_advancedProperties.insert("autoExclusive");
         // by providing this in propeditor
         m_advancedProperties.insert("minimumSize");
         m_advancedProperties.insert("maximumSize");
         m_advancedProperties.insert("clickMessage"); // for backward compatibility Kexi projects created with Qt < 4.7
         m_advancedProperties.insert("showClearButton"); // for backward compatibility Kexi projects created with Qt 4
 #ifndef KEXI_SHOW_UNFINISHED
 /*! @todo reenable */
         m_advancedProperties.insert("accel");
         m_advancedProperties.insert("icon");
         m_advancedProperties.insert("paletteBackgroundPixmap");
         m_advancedProperties.insert("pixmap");
         m_advancedProperties.insert("shortcut"); // renamed from "accel" in Qt 4
         m_advancedProperties.insert("windowIcon"); // renamed from "icon" in Qt 4
 #endif
     }
     ~Private() {
         qDeleteAll(m_factories);
         m_factories.clear();
         qDeleteAll(m_pluginsMetaData);
         m_pluginsMetaData.clear();
     }
 
     QHash<QByteArray, WidgetInfo*> widgets() {
         KDbMessageGuard mg(q);
         (void)loadFactories();
         return m_widgets;
     }
 
     QHash<QByteArray, WidgetFactory*> factories() {
         KDbMessageGuard mg(q);
         (void)loadFactories();
         return m_factories;
     }
 
     bool isAdvancedProperty(const QByteArray &property) const {
         return m_advancedProperties.contains(property);
     }
 
     bool showAdvancedProperties;
 
 private:
     //! Performs a form widget plugins lookup. @return true on success.
     //! @todo This method generates a few warnings, maybe we want to optionally display them somewhere (via the message handler)?
     bool lookup() {
         //! @todo Allow refreshing
         if (m_lookupDone) {
             return m_lookupResult;
         }
         m_lookupDone = true;
         m_lookupResult = false;
         q->clearResult();
 
         QStringList serviceTypes;
-        serviceTypes << "Kexi/FormWidgets";
+        serviceTypes << "Kexi/FormWidget";
         QList<QPluginLoader*> offers = KexiFormWidgetsPluginTrader_instance->query(serviceTypes);
         foreach(const QPluginLoader *loader, offers) {
             QScopedPointer<KexiFormWidgetsPluginMetaData> metaData(new KexiFormWidgetsPluginMetaData(*loader));
             if (metaData->id().isEmpty()) {
                 qWarning() << "No plugin ID specified for Kexi Form Widgets plugin"
                            << metaData->fileName() << "-- skipping!";
                 continue;
             }
             // check version
             const QString expectedVersion = KFormDesigner::version();
             if (metaData->version() != expectedVersion) {
                 qWarning() << "Kexi Form Widgets plugin" << metaData->id() << "has version"
                            << metaData->majorVersion() << "but required version is" << KFormDesigner::version()
                            << "-- skipping!";
                 continue;
             }
             // skip duplicates
             if (m_pluginsMetaData.contains(metaData->id())) {
                 qWarning() << "More than one Kexi Form Widgets plugin with ID"
                            << metaData->id() << metaData->fileName() << "-- skipping this one";
                 continue;
             }
             //qDebug() << "found factory:" << ptr->name();
 
             if (!metaData->group().isEmpty() && !m_supportedFactoryGroups.contains(metaData->group())) {
                 qDebug() << "Factory group" << metaData->group()
                          << "for Form Widgets plugin"
                          << metaData->id() << metaData->fileName()
                          << "is not supported -- skipping!";
                 continue;
             }
+            if (!setupPrivateIconsResourceWithMessage(
+                QLatin1String(KEXI_BASE_NAME_LOWER),
+                QString::fromLatin1("icons/%1_%2.rcc")
+                    .arg(metaData->id()).arg(supportedIconTheme),
+                QtWarningMsg,
+                QString::fromLatin1(":/icons/%1").arg(metaData->id())))
+            {
+                continue;
+            }
 
             m_pluginsMetaData.insert(metaData->id(), metaData.data());
             metaData.take();
         }
         qDeleteAll(offers);
         offers.clear();
         if (m_pluginsMetaData.isEmpty()) {
             q->m_result = KDbResult(i18n("Could not find any form widget plugins."));
             m_couldNotFindAnyFormWidgetPluginsErrorDisplayed = true;
             return false;
         }
         m_lookupResult = true;
         return true;
     }
 
     //! Loads all factory plugins
     bool loadFactories() {
         if (m_loadFactoriesDone) {
             if (m_couldNotFindAnyFormWidgetPluginsErrorDisplayed) {
                 q->clearResult(); // show the warning only once
             }
             return m_loadFactoriesResult;
         }
         m_loadFactoriesDone = true;
         m_loadFactoriesResult = false;
         if (!lookup()) {
             return false;
         }
         foreach (KexiFormWidgetsPluginMetaData *pluginMetaData, m_pluginsMetaData) {
             WidgetFactory *factory = loadFactory(pluginMetaData);
             if (!factory) {
                 continue;
             }
             //collect information about classes to be hidden
             if (factory->hiddenClasses()) {
                 foreach (const QByteArray &c, *factory->hiddenClasses()) {
                     m_hiddenClasses.insert(c);
                 }
             }
         }
 
         //now we have factories instantiated: load widgets
         QList<WidgetFactory*> loadLater;
         foreach (WidgetFactory *factory, m_factories) {
             //ONE LEVEL, FLAT INHERITANCE, but works!
             //if this factory inherits from something, load its witgets later
     //! @todo improve
             if (factory->inheritsFactories())
                 loadLater.append(factory);
             else
                 loadFactoryWidgets(factory);
         }
         //load now the rest
         foreach (WidgetFactory* f, loadLater) {
             loadFactoryWidgets(f);
         }
         m_loadFactoriesResult = true;
         return true;
     }
 
     //! Loads of a single factory. @return true on success
     WidgetFactory *loadFactory(KexiFormWidgetsPluginMetaData *pluginMetaData) {
         KPluginFactory *factory = qobject_cast<KPluginFactory*>(pluginMetaData->instantiate());
         if (!factory) {
             q->m_result = KDbResult(ERR_CANNOT_LOAD_OBJECT,
                                     xi18nc("@info", "Could not load Kexi Form Widgets plugin file <filename>%1</filename>.",
                                            pluginMetaData->fileName()));
             q->setErrorMessage(pluginMetaData, q->result().message());
             qWarning() << q->result().message();
             return 0;
         }
         WidgetFactory *widgetFactory = factory->create<WidgetFactory>(q);
         if (!widgetFactory) {
             q->m_result = KDbResult(ERR_CANNOT_LOAD_OBJECT,
                                     xi18nc("@info",
                                            "Could not open Kexi Form Widgets plugin <filename>%1</filename>.",
                                            pluginMetaData->fileName()));
             qWarning() << q->m_result.message();
             return 0;
         }
         widgetFactory->setLibrary(q);
         widgetFactory->setObjectName(pluginMetaData->id());
         widgetFactory->setAdvancedPropertiesVisible(showAdvancedProperties); //inherit this flag from the library
         m_factories.insert(pluginMetaData->id().toLatin1(), widgetFactory);
         return widgetFactory;
     }
 
     //! Loads widgets for factory @a f
     void loadFactoryWidgets(WidgetFactory *f) {
         QHash<QByteArray, WidgetInfo*> widgetsForFactory(f->classes());
         foreach (WidgetInfo *w, widgetsForFactory) {
             if (m_hiddenClasses.contains( w->className() ))
                 continue; //this class is hidden
             // check if we want to inherit a widget from a different factory
             if (!w->parentFactoryName().isEmpty() && !w->inheritedClassName().isEmpty()) {
                 WidgetFactory *parentFactory = m_factories.value(w->parentFactoryName().toLower());
                 if (!parentFactory) {
                     qWarning() << "class" << w->className() << ": no such parent factory" << w->parentFactoryName();
                     continue;
                 }
                 WidgetInfo* inheritedClass = parentFactory->widgetInfoForClassName(w->inheritedClassName());
                 if (!inheritedClass) {
                     qWarning() << "class" << w->inheritedClassName() << " - no such class to inherit in factory"
                         << w->parentFactoryName();
                     continue;
                 }
                 //ok: inherit properties:
                 w->setInheritedClass( inheritedClass );
                 if (w->iconName().isEmpty())
                     w->setIconName(inheritedClass->iconName());
                 //ok?
                 foreach(const QByteArray& alternateName, inheritedClass->alternateClassNames()) {
                     w->addAlternateClassName(
                         alternateName, inheritedClass->isOverriddenClassName(alternateName));
                 }
                 if (w->includeFileName().isEmpty())
                     w->setIncludeFileName(inheritedClass->includeFileName());
                 if (w->name().isEmpty())
                     w->setName(inheritedClass->name());
                 if (w->namePrefix().isEmpty())
                     w->setNamePrefix(inheritedClass->namePrefix());
                 if (w->description().isEmpty())
                     w->setDescription(inheritedClass->description());
             }
 
             QList<QByteArray> cnames( w->alternateClassNames() );
             cnames.prepend(w->className());
             foreach (const QByteArray &wname, cnames) {
                 WidgetInfo *widgetForClass = widgetsForFactory.value(wname);
                 if (!widgetForClass || (widgetForClass && !widgetForClass->isOverriddenClassName(wname))) {
                     //insert a widgetinfo, if:
                     //1) this class has no alternate class assigned yet, or
                     //2) this class has alternate class assigned but without 'override' flag
                     m_widgets.insert(wname, w);
                 }
             }
         }
     }
 
     WidgetLibrary *q;
     KexiGUIMessageHandler messageHandler;
     //! A map which associates a class name with a Widget class
     QHash<QString, KexiFormWidgetsPluginMetaData*> m_pluginsMetaData; //!< owner
     bool m_couldNotFindAnyFormWidgetPluginsErrorDisplayed;
     QSet<QString> m_supportedFactoryGroups;
     QHash<QByteArray, WidgetFactory*> m_factories; //!< owner
     QHash<QByteArray, WidgetInfo*> m_widgets; //!< owner
     QSet<QByteArray> m_advancedProperties;
     QSet<QByteArray> m_hiddenClasses;
     bool m_lookupDone;
     bool m_lookupResult;
     bool m_loadFactoriesDone;
     bool m_loadFactoriesResult;
 };
 }
 
 using namespace KFormDesigner;
 
 //-------------------------------------------
 
 WidgetLibrary::WidgetLibrary(QObject *parent, const QStringList& supportedFactoryGroups)
         : QObject(parent)
         , KDbResultable()
         , d(new Private(this, supportedFactoryGroups))
 {
 }
 
 WidgetLibrary::~WidgetLibrary()
 {
     delete d;
 }
 
 void WidgetLibrary::createWidgetActions(ActionGroup *group)
 {
     foreach (WidgetInfo *winfo, d->widgets()) {
         LibActionWidget *a = new LibActionWidget(group, winfo);
         connect(a, SIGNAL(toggled(QByteArray)), this, SIGNAL(widgetActionToggled(QByteArray)));
     }
 }
 
 void
 WidgetLibrary::addCustomWidgetActions(KActionCollection *col)
 {
     if (!col)
         return;
     foreach (WidgetFactory *factory, d->factories()) {
         factory->createCustomActions(col);
     }
 }
 
 QWidget* WidgetLibrary::createWidget(const QByteArray &classname, QWidget *parent,
                                      const char *name, Container *c,
                                      WidgetFactory::CreateWidgetOptions options)
 {
     WidgetInfo *wclass = d->widgets().value(classname);
     if (!wclass)
         return 0;
 
     QWidget *widget = wclass->factory()->createWidget(wclass->className(), parent, name, c, options);
     if (!widget) {
         //try to instantiate from inherited class
         if (wclass->inheritedClass())
             widget = wclass->inheritedClass()->factory()->createWidget(
                          wclass->className(), parent, name, c, options);
         if (!widget)
             return 0;
     }
     widget->setAcceptDrops(true);
     if (options & WidgetFactory::DesignViewMode) {
         FormWidgetInterface* fwiface = dynamic_cast<FormWidgetInterface*>(widget);
         if (fwiface)
             fwiface->setDesignMode(true);
     }
     emit widgetCreated(widget);
     return widget;
 }
 
 bool WidgetLibrary::createMenuActions(const QByteArray &c, QWidget *w, QMenu *menu,
                                       KFormDesigner::Container *container)
 {
     WidgetInfo *wclass = d->widgets().value(c);
     if (!wclass)
         return false;
 
     if (wclass->factory()->createMenuActions(c, w, menu, container)) {
         return true;
     }
     //try from inherited class
     if (wclass->inheritedClass()) {
         return wclass->inheritedClass()->factory()->createMenuActions(
                    wclass->className(), w, menu, container);
     }
     return false;
 }
 
 bool WidgetLibrary::startInlineEditing(const QByteArray &classname, QWidget *w,
                                        Container *container)
 {
     WidgetInfo *wclass = d->widgets().value(classname);
     if (!wclass)
         return false;
 
     FormWidgetInterface* fwiface = dynamic_cast<FormWidgetInterface*>(w);
     {
         KFormDesigner::WidgetFactory::InlineEditorCreationArguments args(classname, w, container);
         if (wclass->factory()->startInlineEditing(args)) {
             args.container->form()->createInlineEditor(args);
             if (fwiface)
                 fwiface->setEditingMode(true);
             return true;
         }
     }
     if (wclass->inheritedClass()) {
         //try from inherited class
         KFormDesigner::WidgetFactory::InlineEditorCreationArguments args(wclass->className(), w, container);
         if (wclass->inheritedClass()->factory()->startInlineEditing(args)) {
             args.container->form()->createInlineEditor(args);
             if (fwiface)
                 fwiface->setEditingMode(true);
             return true;
         }
     }
     return false;
 }
 
 bool WidgetLibrary::previewWidget(const QByteArray &classname, QWidget *widget, Container *container)
 {
     WidgetInfo *wclass = d->widgets().value(classname);
     if (!wclass)
         return false;
 
     FormWidgetInterface* fwiface = dynamic_cast<FormWidgetInterface*>(widget);
     if (fwiface)
         fwiface->setDesignMode(false);
     if (wclass->factory()->previewWidget(classname, widget, container))
         return true;
     //try from inherited class
     if (wclass->inheritedClass())
         return wclass->inheritedClass()->factory()->previewWidget(wclass->className(), widget, container);
     return false;
 }
 
 bool WidgetLibrary::clearWidgetContent(const QByteArray &classname, QWidget *w)
 {
     WidgetInfo *wclass = d->widgets().value(classname);
     if (!wclass)
         return false;
 
     if (wclass->factory()->clearWidgetContent(classname, w))
         return true;
     //try from inherited class
     if (wclass->inheritedClass())
         return wclass->inheritedClass()->factory()->clearWidgetContent(wclass->className(), w);
     return false;
 }
 
 QString WidgetLibrary::displayName(const QByteArray &classname)
 {
     WidgetInfo *wi = d->widgets().value(classname);
     if (wi)
         return wi->name();
 
     return classname;
 }
 
 QString WidgetLibrary::savingName(const QByteArray &classname)
 {
     WidgetInfo *wi = d->widgets().value(classname);
     if (wi && !wi->savingName().isEmpty())
         return wi->savingName();
 
     return classname;
 }
 
 QString WidgetLibrary::namePrefix(const QByteArray &classname)
 {
     WidgetInfo *wi = d->widgets().value(classname);
     if (wi)
         return wi->namePrefix();
 
     return classname;
 }
 
 QString WidgetLibrary::textForWidgetName(const QByteArray &name, const QByteArray &className)
 {
     WidgetInfo *widget = d->widgets().value(className);
     if (!widget)
         return QString();
 
     QString newName = name;
     newName.remove(widget->namePrefix());
     newName = widget->name() + (newName.isEmpty() ? QString() : (QLatin1String(" ") + newName));
     return newName;
 }
 
 QByteArray
 WidgetLibrary::classNameForAlternate(const QByteArray &classname)
 {
     if (d->widgets().value(classname))
         return classname;
 
     WidgetInfo *wi =  d->widgets().value(classname);
     if (wi) {
         return wi->className();
     }
 
     // widget not supported
     return "CustomWidget";
 }
 
 QString WidgetLibrary::includeFileName(const QByteArray &classname)
 {
     WidgetInfo *wi = d->widgets().value(classname);
     if (wi)
         return wi->includeFileName();
 
     return QString();
 }
 
 QString
 WidgetLibrary::iconName(const QByteArray &classname)
 {
     WidgetInfo *wi = d->widgets().value(classname);
     if (wi)
         return wi->iconName();
 
     return KexiIconName("unknown-widget");
 }
 
 bool
 WidgetLibrary::saveSpecialProperty(const QByteArray &classname,
     const QString &name, const QVariant &value, QWidget *w,
     QDomElement &parentNode, QDomDocument &parent)
 {
     WidgetInfo *wi = d->widgets().value(classname);
     if (!wi)
         return false;
 
     if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, parent))
         return true;
     //try from inherited class
     if (wi->inheritedClass())
         return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, parent);
     return false;
 }
 
 bool
 WidgetLibrary::readSpecialProperty(const QByteArray &classname,
     QDomElement &node, QWidget *w, ObjectTreeItem *item)
 {
     WidgetInfo *wi = d->widgets().value(classname);
     if (!wi)
         return false;
     if (wi->factory()->readSpecialProperty(classname, node, w, item))
         return true;
     //try from inherited class
     if (wi->inheritedClass())
         return wi->inheritedClass()->factory()->readSpecialProperty(wi->className(), node, w, item);
     return false;
 }
 
 void WidgetLibrary::setAdvancedPropertiesVisible(bool set)
 {
     d->showAdvancedProperties = set;
 }
 
 bool WidgetLibrary::advancedPropertiesVisible() const
 {
     return d->showAdvancedProperties;
 }
 
 bool
 WidgetLibrary::isPropertyVisible(const QByteArray &classname, QWidget *w,
                                  const QByteArray &property, bool multiple, bool isTopLevel)
 {
     if (isTopLevel) {
         // no focus policy for top-level form widget...
         if (!d->showAdvancedProperties && property == "focusPolicy")
             return false;
     }
 
     WidgetInfo *wi = d->widgets().value(classname);
     if (!wi)
         return false;
     if (!d->showAdvancedProperties && d->isAdvancedProperty(property)) {
         //this is advanced property, should we hide it?
         if (!wi->internalProperty("forceShowAdvancedProperty:" + property).toBool()
                 && (!wi->inheritedClass() || !wi->inheritedClass()->internalProperty("forceShowAdvancedProperty:" + property).toBool())) {
             return false; //hide it
         }
     }
 
     if (!wi->factory()->isPropertyVisible(classname, w, property, multiple, isTopLevel))
         return false;
     //try from inherited class
     if (wi->inheritedClass()
             && !wi->inheritedClass()->factory()->isPropertyVisible(wi->className(), w, property, multiple, isTopLevel))
         return false;
 
     return true;
 }
 
 QList<QByteArray> WidgetLibrary::autoSaveProperties(const QByteArray &classname)
 {
     WidgetInfo *wi = d->widgets().value(classname);
     if (!wi)
         return QList<QByteArray>();
     return wi->autoSaveProperties();
 }
 
 WidgetInfo*
 WidgetLibrary::widgetInfoForClassName(const char* classname)
 {
     return d->widgets().value(classname);
 }
 
 WidgetFactory*
 WidgetLibrary::factoryForClassName(const char* classname)
 {
     WidgetInfo *wi = widgetInfoForClassName(classname);
     return wi ? wi->factory() : 0;
 }
 
 QString WidgetLibrary::propertyDescForName(WidgetInfo *winfo, const QByteArray& propertyName)
 {
     if (!winfo || !winfo->factory())
         return QString();
     QString desc(winfo->factory()->propertyDescription(propertyName));
     if (!desc.isEmpty())
         return desc;
     if (winfo->parentFactoryName().isEmpty())
         return QString();
 
     //try in parent factory, if exists
     WidgetFactory *parentFactory = d->factories().value(winfo->parentFactoryName());
     if (!parentFactory)
         return QString();
 
     return parentFactory->propertyDescription(propertyName);
 }
 
 QString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const QByteArray& name)
 {
     if (!winfo->factory())
         return QString();
     QString desc(winfo->factory()->valueDescription(name));
     if (!desc.isEmpty())
         return desc;
     if (winfo->parentFactoryName().isEmpty())
         return QString();
 
     //try in parent factory, if exists
     WidgetFactory *parentFactory = d->factories().value(winfo->parentFactoryName());
     if (!parentFactory)
         return QString();
 
     return parentFactory->valueDescription(name);
 }
 
 void WidgetLibrary::setPropertyOptions(KPropertySet& set, const WidgetInfo& winfo, QWidget* w)
 {
     if (!winfo.factory())
         return;
     winfo.factory()->setPropertyOptions(set, winfo, w);
     if (winfo.parentFactoryName().isEmpty())
         return;
     WidgetFactory *parentFactory = d->factories().value(winfo.parentFactoryName());
     if (!parentFactory)
         return;
     parentFactory->setPropertyOptions(set, winfo, w);
 }
 
 WidgetFactory* WidgetLibrary::factory(const char* factoryName) const
 {
     return d->factories().value(factoryName);
 }
 
 QVariant WidgetLibrary::internalProperty(const QByteArray& classname, const QByteArray& property)
 {
     WidgetInfo *wclass = d->widgets().value(classname);
     if (!wclass)
         return QString();
     QVariant value(wclass->internalProperty(property));
     if (value.isNull() && wclass->inheritedClass())
         return wclass->inheritedClass()->internalProperty(property);
     return value;
 }
 
 WidgetFactory::CreateWidgetOption WidgetLibrary::showOrientationSelectionPopup(
     const QByteArray &classname, QWidget* parent, const QPoint& pos)
 {
     WidgetInfo *wclass = d->widgets().value(classname);
     if (!wclass)
         return WidgetFactory::AnyOrientation;
 
     //get custom icons and strings
     QIcon iconHorizontal, iconVertical;
     QString iconName(wclass->internalProperty("orientationSelectionPopup:horizontalIcon").toString());
     if (iconName.isEmpty() && wclass->inheritedClass())
         iconName = wclass->inheritedClass()->internalProperty("orientationSelectionPopup:horizontalIcon").toString();
     if (!iconName.isEmpty())
         iconHorizontal = QIcon::fromTheme(iconName);
 
     iconName = wclass->internalProperty("orientationSelectionPopup:verticalIcon").toString();
     if (iconName.isEmpty() && wclass->inheritedClass())
         iconName = wclass->inheritedClass()->internalProperty("orientationSelectionPopup:verticalIcon").toString();
     if (!iconName.isEmpty())
         iconVertical = QIcon::fromTheme(iconName);
 
     QString textHorizontal = wclass->internalProperty("orientationSelectionPopup:horizontalText").toString();
     if (textHorizontal.isEmpty() && wclass->inheritedClass())
         iconName = wclass->inheritedClass()->internalProperty("orientationSelectionPopup:horizontalText").toString();
     if (textHorizontal.isEmpty()) //default
         textHorizontal = xi18nc("Insert Horizontal Widget", "Insert Horizontal");
 
     QString textVertical = wclass->internalProperty("orientationSelectionPopup:verticalText").toString();
     if (textVertical.isEmpty() && wclass->inheritedClass())
         iconName = wclass->inheritedClass()->internalProperty("orientationSelectionPopup:verticalText").toString();
     if (textVertical.isEmpty()) //default
         textVertical = xi18nc("Insert Vertical Widget", "Insert Vertical");
 
     QMenu popup(parent);
     popup.setObjectName("orientationSelectionPopup");
     popup.addSection(QIcon::fromTheme(wclass->iconName()), xi18n("Insert Widget: %1", wclass->name()));
     QAction* horizAction = popup.addAction(iconHorizontal, textHorizontal);
     QAction* vertAction = popup.addAction(iconVertical, textVertical);
     popup.addSeparator();
     popup.addAction(koIcon("dialog-cancel"), xi18n("Cancel"));
     QAction *a = popup.exec(pos);
     if (a == horizAction)
         return WidgetFactory::HorizontalOrientation;
     else if (a == vertAction)
         return WidgetFactory::VerticalOrientation;
 
     return WidgetFactory::AnyOrientation; //means "cancelled"
 }
 
 bool WidgetLibrary::propertySetShouldBeReloadedAfterPropertyChange(
     const QByteArray& classname, QWidget *w, const QByteArray& property)
 {
     WidgetInfo *winfo = widgetInfoForClassName(classname);
     if (!winfo)
         return false;
     return winfo->factory()->propertySetShouldBeReloadedAfterPropertyChange(classname, w, property);
 }
 
 ObjectTreeItem* WidgetLibrary::selectableItem(ObjectTreeItem* item)
 {
     //qDebug() << item->widget()->metaObject()->className();
     WidgetInfo *wi = d->widgets().value(item->widget()->metaObject()->className());
     if (!wi)
         return item;
     return wi->factory()->selectableItem(item);
 }
 
 
 void WidgetLibrary::setErrorMessage(KexiFormWidgetsPluginMetaData *pluginMetaData, const QString& errorMessage)
 {
     pluginMetaData->setErrorMessage(errorMessage);
 }
diff --git a/src/plugins/forms/CMakeLists.txt b/src/plugins/forms/CMakeLists.txt
index c377902db..0523f8d14 100644
--- a/src/plugins/forms/CMakeLists.txt
+++ b/src/plugins/forms/CMakeLists.txt
@@ -1,111 +1,89 @@
 include_directories( ${CMAKE_SOURCE_DIR}/src/core
     ${CMAKE_SOURCE_DIR}/src/widget/utils ${CMAKE_SOURCE_DIR}/src/widget
     ${CMAKE_SOURCE_DIR}/src/formeditor)
 
-if(MARBLE_FOUND)
-#TODO  add_subdirectory(widgets/mapbrowser)
-endif()
-
-if(Qt5WebKitWidgets_FOUND)
-  add_subdirectory(widgets/webbrowser)
-endif()
-
-# the main plugin
+# the form plugin
 set(kexi_formplugin_SRCS kexiforms.cpp)
 
 add_library(kexi_formplugin MODULE ${kexi_formplugin_SRCS})
 kcoreaddons_desktop_to_json(kexi_formplugin kexi_formplugin.desktop)
 
 target_link_libraries(kexi_formplugin
     kexicore
     kexiguiutils
     kexidatatable
     kexiextendedwidgets
     kformdesigner
     kexiformutils
 
     KPropertyWidgets
 )
 
 install(TARGETS kexi_formplugin DESTINATION ${KEXI_PLUGIN_INSTALL_DIR})
 
-# the form widgets plugin
-set(kexiforms_dbwidgetsplugin_SRCS kexidbfactory.cpp)
-
-add_library(kexiforms_dbwidgetsplugin MODULE ${kexiforms_dbwidgetsplugin_SRCS})
-kcoreaddons_desktop_to_json(kexiforms_dbwidgetsplugin kexiforms_dbwidgetsplugin.desktop)
-
-target_link_libraries(kexiforms_dbwidgetsplugin
-    PRIVATE
-        kformdesigner
-        kexiformutils
-        kexicore
-        kexiguiutils
-        kexidataviewcommon
-        kexidatatable
-        kexiextendedwidgets
-
-        KDb
-
-        Qt5::Gui
-)
-
-install(TARGETS kexiforms_dbwidgetsplugin DESTINATION ${KEXI_FORM_WIDGETS_PLUGIN_INSTALL_DIR})
-
 # the form utils lib
 set(kexiformutils_LIB_SRCS
  #  kexiformdataiteminterface.cpp
    kexidataawarewidgetinfo.cpp
    KexiFormScrollAreaWidget.cpp
    kexiformscrollview.cpp
    kexidbtextwidgetinterface.cpp
    kexiformmanager.cpp
    kexidatasourcepage.cpp
    kexiformpart.cpp
    kexiformview.cpp
    kexidbfactorybase.cpp
 
   widgets/kexidbutils.cpp
   widgets/kexidbautofield.cpp
   widgets/kexidbform.cpp
   widgets/kexidblabel.cpp
   widgets/kexidbimagebox.cpp
   widgets/KexiDBPushButton.cpp
   widgets/kexiframe.cpp
   widgets/kexidblineedit.cpp
   widgets/kexidbcheckbox.cpp
   widgets/kexidbtextedit.cpp
   widgets/kexidbcombobox.cpp
   widgets/kexidbcommandlinkbutton.cpp
   widgets/kexidbslider.cpp
   widgets/kexidbprogressbar.cpp
   widgets/kexidbdatepicker.cpp
 )
 
     #obsolete    widgets/kexidbdoublespinbox.cpp
     #obsolete    widgets/kexidbintspinbox.cpp
 
 add_library(kexiformutils SHARED ${kexiformutils_LIB_SRCS})
 
 generate_export_header(kexiformutils)
 
 target_link_libraries(kexiformutils
     PRIVATE
         kexicore
         kexiextendedwidgets
         kformdesigner
         kexiutils
         kexidataviewcommon
         kexidatatable
         kexiguiutils
 
         KDb
         KPropertyWidgets
 
         Qt5::Gui
         Qt5::Xml
 )
+set(kexiformutils_INCLUDE_DIRS
+    ${CMAKE_SOURCE_DIR}/src/plugins/forms
+    ${CMAKE_SOURCE_DIR}/src/plugins/forms/widgets
+)
+target_include_directories(kexiformutils
+    PUBLIC "$<BUILD_INTERFACE:${kexiformutils_INCLUDE_DIRS}>"
+)
 
 set_target_properties(kexiformutils PROPERTIES VERSION ${GENERIC_PROJECT_LIB_VERSION}
                       SOVERSION ${GENERIC_PROJECT_LIB_SOVERSION})
 install(TARGETS kexiformutils  ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+add_subdirectory(widgets)
diff --git a/src/plugins/forms/kexiformmanager.cpp b/src/plugins/forms/kexiformmanager.cpp
index 4b04c5ef4..cf16c0faf 100644
--- a/src/plugins/forms/kexiformmanager.cpp
+++ b/src/plugins/forms/kexiformmanager.cpp
@@ -1,559 +1,561 @@
 /* This file is part of the KDE project
    Copyright (C) 2005-2011 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 "kexiformmanager.h"
-#include "widgets/kexidbform.h"
-#include "widgets/kexidbautofield.h"
+#include "kexidbform.h"
+#ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
+#include "kexidbautofield.h"
+#endif
 #include "kexiformscrollview.h"
 #include "kexiformview.h"
 #include "kexidatasourcepage.h"
 
 #include <KexiIcon.h>
 
 #include <QDomDocument>
 #include <QAction>
 #include <QDebug>
 
 #include <KToggleAction>
 #include <KActionCollection>
 #include <KPageDialog>
 #include <KTextEdit>
 #include <KToolBar>
 #include <KSharedConfig>
 #include <KConfigGroup>
 
 #include <formeditor/form.h>
 #include <formeditor/widgetlibrary.h>
 #include <formeditor/commands.h>
 #include <formeditor/objecttree.h>
 #include <formeditor/formIO.h>
 #include <formeditor/kexiactionselectiondialog.h>
 #include <formeditor/WidgetTreeWidget.h>
 
 #include <KPropertySet>
 #include <KProperty>
 #include <widget/properties/KexiCustomPropertyFactory.h>
 #include <core/KexiMainWindowIface.h>
 #include <kexiutils/SmallToolButton.h>
 #include <kexiutils/utils.h>
 #include <config-kexi.h>
 
 class KexiFormManagerPrivate {
 public:
     explicit KexiFormManagerPrivate(KexiFormManager *qq) : part(0)
         , q(qq)
     {
         features = KFormDesigner::Form::NoFeatures;
         widgetActionGroup = new KFormDesigner::ActionGroup(q);
 #ifdef KFD_SIGSLOTS
         dragConnectionAction = 0;
 #endif
         widgetTree = 0;
         collection = 0;
     }
     ~KexiFormManagerPrivate() {
     }
     KexiFormPart* part;
     KFormDesigner::WidgetLibrary* lib;
     KFormDesigner::ActionGroup* widgetActionGroup;
     KFormDesigner::WidgetTreeWidget *widgetTree;
     KActionCollection  *collection;
     KFormDesigner::Form::Features features;
     KToggleAction *pointerAction;
 #ifdef KFD_SIGSLOTS
     KToggleAction *dragConnectionAction;
 #endif
     KToggleAction *snapToGridAction;
 
     KexiFormManager *q;
 };
 
 Q_GLOBAL_STATIC(KexiFormManager, g_manager)
 
 KexiFormManager* KexiFormManager::self()
 {
     return g_manager;
 }
 
 KexiFormManager::KexiFormManager()
         : QObject()
         , d(new KexiFormManagerPrivate(this))
 {
     KexiCustomPropertyFactory::init();
 }
 
 KexiFormManager::~KexiFormManager()
 {
     delete d;
 }
 
 void KexiFormManager::init(KexiFormPart *part, KFormDesigner::WidgetTreeWidget *widgetTree)
 {
 /*! @todo add configuration for supported factory groups */
     QStringList supportedFactoryGroups;
     supportedFactoryGroups += "kexi";
     d->lib = new KFormDesigner::WidgetLibrary(this, supportedFactoryGroups);
     d->lib->setAdvancedPropertiesVisible(false);
 
     connect(d->lib, SIGNAL(widgetCreated(QWidget*)),
             this, SLOT(slotWidgetCreatedByFormsLibrary(QWidget*)));
     connect(d->lib, SIGNAL(widgetActionToggled(QByteArray)),
         this, SLOT(slotWidgetActionToggled(QByteArray)));
 
     d->part = part;
     KActionCollection *col = /*tmp*/ new KActionCollection(this);
     if (col) {
         createActions( col );
         //connect actions provided by widget factories
         connect(col->action("widget_assign_action"), SIGNAL(triggered()),
                 this, SLOT(slotAssignAction()));
     }
 
     d->widgetTree = widgetTree;
     if (d->widgetTree) {
 //! @todo KEXI3 Port this: connect()
 //! @todo KEXI3 Port code related to KFormDesigner::FormManager::m_treeview here
 //! @todo        connect(m_propSet, SIGNAL(widgetNameChanged(QByteArray,QByteArray)),
 //! @todo                m_treeview, SLOT(renameItem(QByteArray,QByteArray)));
     }
 }
 
 KFormDesigner::ActionGroup* KexiFormManager::widgetActionGroup() const
 {
     return d->widgetActionGroup;
 }
 
 void KexiFormManager::createActions(KActionCollection* collection)
 {
     d->collection = collection;
     d->lib->createWidgetActions(d->widgetActionGroup);
 //! @todo insertWidget() slot?
 
 #ifdef KFD_SIGSLOTS
     if (d->features & KFormDesigner::Form::EnableConnections) {
         // nothing
     }
     else {
         d->dragConnectionAction = new KToggleAction(
             KexiIcon("signalslot"), futureI18n("Connect Signals/Slots"), d->collection);
         d->dragConnectionAction->setObjectName("drag_connection");
         connect(d->dragConnectionAction, SIGNAL(triggered()),
                 this, SLOT(startCreatingConnection()));
         d->dragConnectionAction->setChecked(false);
     }
 #endif
 
     d->pointerAction = new KToggleAction(
         koIcon("tool-pointer"), xi18n("Pointer"), d->collection);
     d->pointerAction->setObjectName("edit_pointer");
     d->widgetActionGroup->addAction(d->pointerAction);
     connect(d->pointerAction, SIGNAL(triggered()),
             this, SLOT(slotPointerClicked()));
     d->pointerAction->setChecked(true);
 
     d->snapToGridAction = new KToggleAction(
         xi18n("Snap to Grid"), d->collection);
     d->snapToGridAction->setObjectName("snap_to_grid");
 
 //! @todo
 #if 0
     // Create the Style selection action (with a combo box in toolbar and submenu items)
     KSelectAction *styleAction = new KSelectAction(
         xi18n("Style"), d->collection);
     styleAction->setObjectName("change_style");
     connect(styleAction, SIGNAL(triggered()),
             this, SLOT(slotStyle()));
     styleAction->setEditable(false);
 
     QString currentStyle(kapp->style()->objectName().toLower());
     const QStringList styles = QStyleFactory::keys();
     styleAction->setItems(styles);
     styleAction->setCurrentItem(0);
 
     QStringList::ConstIterator endIt = styles.constEnd();
     int idx = 0;
     for (QStringList::ConstIterator it = styles.constBegin(); it != endIt; ++it, ++idx) {
         if ((*it).toLower() == currentStyle) {
             styleAction->setCurrentItem(idx);
             break;
         }
     }
     styleAction->setToolTip(xi18n("Set the current view style."));
     styleAction->setMenuAccelsEnabled(true);
 #endif
 
     d->lib->addCustomWidgetActions(d->collection);
 
 #ifdef KEXI_DEBUG_GUI
     KConfigGroup generalGroup(KSharedConfig::openConfig()->group("General"));
     if (generalGroup.readEntry("ShowInternalDebugger", false)) {
         QAction *a = new QAction(koIcon("run-build-file"), xi18n("Show Form UI Code"), this);
         d->collection->addAction("show_form_ui", a);
         a->setShortcut(Qt::CTRL + Qt::Key_U);
         connect(a, SIGNAL(triggered()), this, SLOT(showFormUICode()));
     }
 #endif
 
 //! @todo move elsewhere
     {
         // (from obsolete kexiformpartinstui.rc)
         QStringList formActions;
         formActions
             << "edit_pointer"
             << QString() //sep
 #ifndef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
             << "library_widget_KexiDBAutoField"
 #endif
             << "library_widget_KexiDBLabel"
             << "library_widget_KexiDBLineEdit"
             << "library_widget_KexiDBTextEdit"
             << "library_widget_KexiDBComboBox"
             << "library_widget_KexiDBCheckBox"
             << "library_widget_KexiDBImageBox"
             << QString() //sep
             << "library_widget_KexiDBPushButton"
             << QString() //sep
             << "library_widget_KexiFrame"
             << "library_widget_QGroupBox"
             << "library_widget_KFDTabWidget"
-            << "library_widget_Line"
+            << "library_widget_KexiLineWidget"
             << QString() //sep
 #ifdef HAVE_QTWEBKITWIDGETS
             << "library_widget_WebBrowserWidget"
 #endif
 #ifdef HAVE_MARBLE
             << "library_widget_MapBrowserWidget"
 #endif
             << "library_widget_KexiDBSlider"
             << "library_widget_KexiDBProgressBar"
             << "library_widget_KexiDBCommandLinkButton"
             << "library_widget_KexiDBDatePicker"
             << QString() //sep
             ;
         KexiMainWindowIface *win = KexiMainWindowIface::global();
         foreach( const QString& actionName_, formActions ) {
             QAction *a;
             const QString actionName(actionName_.startsWith(':') ? actionName_.mid(1) : actionName_);
             if (actionName.isEmpty()) {
                 a = new QAction(this);
                 a->setSeparator(true);
             }
             else {
                 a = d->widgetActionGroup->action(actionName);
             }
             if (actionName_.startsWith(':')) {  // icon only
                 KexiSmallToolButton *btn = new KexiSmallToolButton(a, win->toolBar("form"));
                 btn->setToolButtonStyle(Qt::ToolButtonIconOnly);
                 win->appendWidgetToToolbar("form", btn);
             }
             else {
                 win->addToolBarAction("form", a);
             }
         }
 
         QSet<QString> iconOnlyActions;
         const QList<QAction*> actions( d->collection->actions() );
         foreach( QAction *a, actions ) {
             if (iconOnlyActions.contains(a->objectName())) { // icon only
                 KexiSmallToolButton *btn = new KexiSmallToolButton(a, win->toolBar("form"));
                 btn->setToolButtonStyle(Qt::ToolButtonIconOnly);
                 win->appendWidgetToToolbar("form", btn);
                 win->setWidgetVisibleInToolbar(btn, true);
             }
             else {
                 win->addToolBarAction("form", a);
             }
         }
     }
 }
 
 void KexiFormManager::slotWidgetCreatedByFormsLibrary(QWidget* widget)
 {
     QList<QMetaMethod> _signals(KexiUtils::methodsForMetaObject(
                                     widget->metaObject(), QMetaMethod::Signal));
 
     if (!_signals.isEmpty()) {
         QByteArray handleDragMoveEventSignal = "handleDragMoveEvent(QDragMoveEvent*)";
         QByteArray handleDropEventSignal = "handleDropEvent(QDropEvent*)";
         KexiFormView *formView = KDbUtils::findParent<KexiFormView*>(widget);
 
         foreach(const QMetaMethod& method, _signals) {
             if (0 == qstrcmp(method.methodSignature(), handleDragMoveEventSignal)) {
                 //qDebug() << method.methodSignature();
                 if (formView) {
                     connect(widget, SIGNAL(handleDragMoveEvent(QDragMoveEvent*)),
                             formView, SLOT(slotHandleDragMoveEvent(QDragMoveEvent*)));
                 }
             } else if (0 == qstrcmp(method.methodSignature(), handleDropEventSignal)) {
                 //qDebug() << method.methodSignature();
                 if (formView) {
                     connect(widget, SIGNAL(handleDropEvent(QDropEvent*)),
                             formView, SLOT(slotHandleDropEvent(QDropEvent*)));
                 }
             }
         }
     }
 }
 
 void KexiFormManager::slotWidgetActionToggled(const QByteArray& action)
 {
     KexiFormView* fv = activeFormViewWidget();
     if (fv) {
         fv->form()->enterWidgetInsertingState(action);
     }
 }
 
 KFormDesigner::WidgetLibrary* KexiFormManager::library() const
 {
     return d->lib;
 }
 
 QAction* KexiFormManager::action(const char* name)
 {
     KActionCollection *col = d->part->actionCollectionForMode(Kexi::DesignViewMode);
     if (!col)
         return 0;
     QString n(translateName(name));
     QAction *a = col->action(n);
     if (a)
         return a;
     if (activeFormViewWidget()) {
         a = KexiMainWindowIface::global()->actionCollection()->action(n);
         if (a)
             return a;
     }
     return d->collection->action(name);
 }
 
 KexiFormView* KexiFormManager::activeFormViewWidget() const
 {
     KexiWindow *currentWindow = KexiMainWindowIface::global()->currentWindow();
     if (!currentWindow)
         return 0;
     KexiFormView *currentView = dynamic_cast<KexiFormView*>(currentWindow->selectedView());
     if (!currentView || currentView->viewMode()!=Kexi::DesignViewMode) {
         return 0;
     }
     KFormDesigner::Form *form = currentView->form();
     if (!form) {
         return 0;
     }
     KexiDBForm *dbform = dynamic_cast<KexiDBForm*>(form->formWidget());
     if (!dbform) {
         return 0;
     }
     KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
     if (!scrollViewWidget)
         return 0;
     return dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
 }
 
 void KexiFormManager::enableAction(const char* name, bool enable)
 {
     KexiFormView* formViewWidget = activeFormViewWidget();
     if (!formViewWidget)
         return;
     formViewWidget->setAvailable(translateName(name).toLatin1(), enable);
 }
 
 void KexiFormManager::setFormDataSource(const QString& pluginId, const QString& name)
 {
     KexiFormView* formViewWidget = activeFormViewWidget();
     if (!formViewWidget)
         return;
     KexiDBForm* formWidget = dynamic_cast<KexiDBForm*>(formViewWidget->form()->widget());
     if (!formWidget)
         return;
 
     QString oldDataSourcePartClass(formWidget->dataSourcePluginId());
     QString oldDataSource(formWidget->dataSource());
     if (pluginId != oldDataSourcePartClass || name != oldDataSource) {
         QHash<QByteArray, QVariant> propValues;
         propValues.insert("dataSource", name);
         propValues.insert("dataSourcePartClass", pluginId);
         KFormDesigner::PropertyCommandGroup *group = new KFormDesigner::PropertyCommandGroup(
             xi18n("Set form's data source to <resource>%1</resource>", name));
         formViewWidget->form()->createPropertyCommandsInDesignMode(
             formWidget, propValues, group, true /*addToActiveForm*/);
     }
 }
 
 void KexiFormManager::setDataSourceFieldOrExpression(
     const QString& string, const QString& caption, KDbField::Type type)
 {
     KexiFormView* formViewWidget = activeFormViewWidget();
     if (!formViewWidget)
         return;
 
     KPropertySet* set = formViewWidget->form()->propertySet();
     if (!set->contains("dataSource"))
         return;
 
     set->property("dataSource").setValue(string);
 
     if (set->propertyValue("autoCaption", false).toBool()) {
         set->changePropertyIfExists("fieldCaptionInternal", caption);
     }
     if (set->propertyValue("widgetType").toString() == "Auto") {
         set->changePropertyIfExists("fieldTypeInternal", type);
     }
 }
 
 void KexiFormManager::insertAutoFields(const QString& sourcePartClass, const QString& sourceName,
                                        const QStringList& fields)
 {
 #ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
     Q_UNUSED(sourcePartClass);
     Q_UNUSED(sourceName);
     Q_UNUSED(fields);
 #else
     KexiFormView* formViewWidget = activeFormViewWidget();
     if (!formViewWidget || !formViewWidget->form() || !formViewWidget->form()->activeContainer())
         return;
     formViewWidget->insertAutoFields(sourcePartClass, sourceName, fields,
                                      formViewWidget->form()->activeContainer());
 #endif
 }
 
 void KexiFormManager::slotHistoryCommandExecuted(KFormDesigner::Command *command)
 {
     if (command->childCount() == 2) {
         KexiFormView* formViewWidget = activeFormViewWidget();
         if (!formViewWidget)
             return;
         KexiDBForm* formWidget = dynamic_cast<KexiDBForm*>(formViewWidget->form()->widget());
         if (!formWidget)
             return;
         const KFormDesigner::PropertyCommand* pc1
             = dynamic_cast<const KFormDesigner::PropertyCommand*>(command->child(0));
         const KFormDesigner::PropertyCommand* pc2
             = dynamic_cast<const KFormDesigner::PropertyCommand*>(command->child(1));
         if (pc1 && pc2 && pc1->propertyName() == "dataSource" && pc2->propertyName() == "dataSourcePartClass") {
             const QHash<QByteArray, QVariant>::const_iterator it1(pc1->oldValues().constBegin());
             const QHash<QByteArray, QVariant>::const_iterator it2(pc2->oldValues().constBegin());
             if (it1.key() == formWidget->objectName() && it2.key() == formWidget->objectName())
                 d->part->dataSourcePage()->setFormDataSource(
                     formWidget->dataSourcePluginId(), formWidget->dataSource());
         }
     }
 }
 
 void KexiFormManager::showFormUICode()
 {
 #ifdef KEXI_DEBUG_GUI
     KexiFormView* formView = activeFormViewWidget();
     if (!formView)
         return;
     formView->form()->resetInlineEditor();
 
     QString uiCode;
     const int indent = 2;
     if (!KFormDesigner::FormIO::saveFormToString(formView->form(), uiCode, indent)) {
         //! @todo show err?
         return;
     }
 
     KPageDialog uiCodeDialog;
     uiCodeDialog.setFaceType(KPageDialog::Tabbed);
     uiCodeDialog.setModal(true);
     uiCodeDialog.setWindowTitle(xi18nc("@title:window", "Form's UI Code"));
     uiCodeDialog.resize(700, 600);
     KTextEdit *currentUICodeDialogEditor = new KTextEdit(&uiCodeDialog);
     uiCodeDialog.addPage(currentUICodeDialogEditor, xi18n("Current"));
     currentUICodeDialogEditor->setReadOnly(true);
     QFont f(currentUICodeDialogEditor->font());
     f.setFamily("courier");
     currentUICodeDialogEditor->setFont(f);
 
     KTextEdit *originalUICodeDialogEditor = new KTextEdit(&uiCodeDialog);
     uiCodeDialog.addPage(originalUICodeDialogEditor, xi18n("Original"));
     originalUICodeDialogEditor->setReadOnly(true);
     originalUICodeDialogEditor->setFont(f);
     currentUICodeDialogEditor->setPlainText(uiCode);
     //indent and set our original doc as well:
     QDomDocument doc;
     doc.setContent(formView->form()->m_recentlyLoadedUICode);
     originalUICodeDialogEditor->setPlainText(doc.toString(indent));
     uiCodeDialog.exec();
 #endif
 }
 
 void KexiFormManager::slotAssignAction()
 {
     KexiFormView* formView = activeFormViewWidget();
     if (!formView)
         return;
     KFormDesigner::Form *form = formView->form();
     KexiDBForm *dbform = 0;
     if (form->mode() != KFormDesigner::Form::DesignMode
         || !(dbform = dynamic_cast<KexiDBForm*>(form->formWidget())))
     {
         return;
     }
 
     KPropertySet* set = form->propertySet();
 
     KexiFormEventAction::ActionData data;
     const KProperty &onClickActionProp = set->property("onClickAction");
     if (!onClickActionProp.isNull())
         data.string = onClickActionProp.value().toString();
 
     const KProperty &onClickActionOptionProp = set->property("onClickActionOption");
     if (!onClickActionOptionProp.isNull())
         data.option = onClickActionOptionProp.value().toString();
 
     KexiFormScrollView *scrollViewWidget
         = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
     if (!scrollViewWidget)
         return;
     KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
     if (!formViewWidget)
         return;
 
     KexiActionSelectionDialog dlg(dbform, data,
                                   set->property("objectName").value().toString());
 
     if (dlg.exec() == QDialog::Accepted) {
         data = dlg.currentAction();
         //update property value
         set->changeProperty("onClickAction", data.string);
         set->changeProperty("onClickActionOption", data.option);
     }
 }
 
 void KexiFormManager::slotPointerClicked()
 {
     KexiFormView* formView = activeFormViewWidget();
     if (!formView)
         return;
     formView->form()->enterWidgetSelectingState();
 }
 
 QString KexiFormManager::translateName(const char* name) const
 {
     QString n(QString::fromLatin1(name));
     // translate to our name space:
     if (n.startsWith("align_") || n.startsWith("adjust_")
             || n == "format_raise" || n == "format_lower" || n == "taborder")
     {
         n.prepend("formpart_");
     }
     return n;
 }
 
diff --git a/src/plugins/forms/kexiforms_dbwidgetsplugin.desktop b/src/plugins/forms/kexiforms_dbwidgetsplugin.desktop
deleted file mode 100644
index 2c87bb7eb..000000000
--- a/src/plugins/forms/kexiforms_dbwidgetsplugin.desktop
+++ /dev/null
@@ -1,54 +0,0 @@
-[Desktop Entry]
-Name=Database Widgets
-Name[ca]=Estris de base de dades
-Name[ca@valencia]=Estris de base de dades
-Name[cs]=Databázové widgety
-Name[de]=Datenbankbedienelemente
-Name[en_GB]=Database Widgets
-Name[es]=Elementos gráficos de bases de datos
-Name[fi]=Tietokantaelementit
-Name[gl]=Trebellos de base de datos
-Name[ia]=Widgets de Base de Datos
-Name[it]=Oggetti di banche dati
-Name[nl]=Databasewidgets
-Name[pl]=Baza danych elementów interfejsu
-Name[pt]=Elementos de Bases de Dados
-Name[pt_BR]=Elementos de banco de dados
-Name[sk]=Databázové widgety
-Name[sv]=Databaskomponenter
-Name[uk]=Віджети бази даних
-Name[x-test]=xxDatabase Widgetsxx
-Comment=Kexi plugin providing database form widgets
-Comment[ca]=Connector del Kexi que proporciona estris de formularis de bases de dades
-Comment[ca@valencia]=Connector del Kexi que proporciona estris de formularis de bases de dades
-Comment[de]=Kexi-Modul, das Datenbankbedienelemente bereitstellt
-Comment[en_GB]=Kexi plugin providing database form widgets
-Comment[es]=Complemento de Kexi que proporciona elementos gráficos para formularios de bases de datos
-Comment[fi]=Kexi-liitännäinen, joka tarjoaa tietokannan lomake-elementit
-Comment[gl]=Complemento de Kexi que fornece trebellos de base de datos para formularios.
-Comment[it]=Estensione che fornisce oggetti dei moduli delle banche dati di Kexi
-Comment[nl]=Kexi-plug-in levert formulierwidgets voor database
-Comment[pl]=Wtyczka Kexi dostarczająca formularze bazodanowe
-Comment[pt]='Plugin' do Kexi que oferece elementos gráficos de formulários de bases de dados
-Comment[pt_BR]=Plugin do Kexi que oferece elementos gráficos de formulários de bancos de dados
-Comment[sk]=Kexi plugin poskytujúci widgety databázových formulárov
-Comment[sv]=Kexi-insticksprogram som tillhandahåller komponenter för databasformulär
-Comment[uk]=Додаток до Kexi, що забезпечує роботу віджетів форм бази даних
-Comment[x-test]=xxKexi plugin providing database form widgetsxx
-Type=Service
-Icon=form
-Encoding=UTF-8
-
-X-KDE-Library=kexiforms_dbwidgetsplugin
-X-KDE-ServiceTypes=Kexi/FormWidgets
-X-KDE-PluginInfo-Author=Kexi Team
-X-KDE-PluginInfo-Email=kexi@kde.org
-X-KDE-PluginInfo-Name=org.kexi-project.form.widgets.db
-X-KDE-PluginInfo-Version=3.0
-X-KDE-PluginInfo-Website=http://kexi-project.org
-X-KDE-PluginInfo-Category=
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
-
-X-Kexi-FormWidgetsFactoryGroup=
diff --git a/src/plugins/forms/widgets/CMakeLists.txt b/src/plugins/forms/widgets/CMakeLists.txt
new file mode 100644
index 000000000..107d578a8
--- /dev/null
+++ b/src/plugins/forms/widgets/CMakeLists.txt
@@ -0,0 +1,20 @@
+set(KEXI_FORM_WIDGETS_PLUGIN_INSTALL_DIR ${KEXI_PLUGIN_INSTALL_DIR}/forms/widgets)
+
+# Convenience macro that adds icon resource for given plugin and theme.
+# Icons are placed in a path that contains _plugin_target.
+# For example,  icons/org.kexi-project.form.widgets.web-browser/breeze/actions/16/kexiform-web-browser.svg.
+# This helps to make plugins not conflicting.
+macro(kexi_add_plugin_icons_rcc_file _plugin_target _theme)
+    kexi_add_icons_rcc_file(${_plugin_target}_${_theme} ${_plugin_target} ${_theme} ${_plugin_target})
+endmacro()
+
+# the main widgets plugin
+add_subdirectory(main)
+
+if(MARBLE_FOUND)
+#TODO  add_subdirectory(mapbrowser)
+endif()
+
+if(Qt5WebKitWidgets_FOUND)
+  add_subdirectory(webbrowser)
+endif()
diff --git a/src/plugins/forms/widgets/main/CMakeLists.txt b/src/plugins/forms/widgets/main/CMakeLists.txt
new file mode 100644
index 000000000..93fdd08bb
--- /dev/null
+++ b/src/plugins/forms/widgets/main/CMakeLists.txt
@@ -0,0 +1,29 @@
+# the main form widgets plugin
+
+set(kexiforms_mainwidgetsplugin_SRCS
+    KexiStandardFormWidgets.cpp
+    KexiStandardContainerFormWidgets.cpp
+    KexiMainFormWidgetsFactory.cpp
+    kexiforms_mainwidgetsplugin.json
+)
+
+add_library(org.kexi-project.form.widgets.main MODULE ${kexiforms_mainwidgetsplugin_SRCS})
+
+target_link_libraries(org.kexi-project.form.widgets.main
+    PRIVATE
+        kformdesigner
+        kexiformutils
+        kexicore
+        kexiguiutils
+        kexidataviewcommon
+        kexidatatable
+        kexiextendedwidgets
+
+        KDb
+
+        Qt5::Gui
+)
+
+install(TARGETS org.kexi-project.form.widgets.main DESTINATION ${KEXI_FORM_WIDGETS_PLUGIN_INSTALL_DIR})
+
+add_subdirectory(pics)
diff --git a/src/plugins/forms/kexidbfactory.cpp b/src/plugins/forms/widgets/main/KexiMainFormWidgetsFactory.cpp
similarity index 52%
rename from src/plugins/forms/kexidbfactory.cpp
rename to src/plugins/forms/widgets/main/KexiMainFormWidgetsFactory.cpp
index 018384b57..d1aabf5fd 100644
--- a/src/plugins/forms/kexidbfactory.cpp
+++ b/src/plugins/forms/widgets/main/KexiMainFormWidgetsFactory.cpp
@@ -1,846 +1,1422 @@
 /* This file is part of the KDE project
    Copyright (C) 2004 Cedric Pasteur <cedric.pasteur@free.fr>
-   Copyright (C) 2004-2014 Jarosław Staniek <staniek@kde.org>
+   Copyright (C) 2004-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 "kexidbfactory.h"
+#include "KexiMainFormWidgetsFactory.h"
 #include <KexiIcon.h>
 #include <formeditor/container.h>
 #include <formeditor/form.h>
 #include <formeditor/formIO.h>
 #include <formeditor/objecttree.h>
 #include <formeditor/utils.h>
 #include <formeditor/widgetlibrary.h>
 #include <core/kexi.h>
 #include <core/kexipart.h>
 #include <core/KexiMainWindowIface.h>
 #include <kexiutils/utils.h>
 #include <kexiutils/KexiCommandLinkButton.h>
 #include <widget/properties/KexiCustomPropertyFactory.h>
 #include <widget/utils/kexicontextmenuutils.h>
 #include <kexi_global.h>
 #include "kexiformview.h"
-#include "widgets/kexidbautofield.h"
-#include "widgets/kexidbcheckbox.h"
-#include "widgets/kexidbimagebox.h"
-#include "widgets/kexiframe.h"
-#include "widgets/kexidblabel.h"
-#include "widgets/kexidblineedit.h"
-#include "widgets/kexidbtextedit.h"
-#include "widgets/kexidbcombobox.h"
-#include "widgets/KexiDBPushButton.h"
-#include "widgets/kexidbform.h"
-#include "widgets/kexidbcommandlinkbutton.h"
-#include "widgets/kexidbslider.h"
-#include "widgets/kexidbprogressbar.h"
-#include "widgets/kexidbdatepicker.h"
+#include "KexiStandardContainerFormWidgets.h"
+#include "KexiStandardFormWidgets.h"
+#include "kexidbcheckbox.h"
+#include "kexidbimagebox.h"
+#include "kexiframe.h"
+#include "kexidblabel.h"
+#include "kexidblineedit.h"
+#include "kexidbtextedit.h"
+#include "kexidbcombobox.h"
+#include "KexiDBPushButton.h"
+#include "kexidbform.h"
+#include "kexidbcommandlinkbutton.h"
+#include "kexidbslider.h"
+#include "kexidbprogressbar.h"
+#include "kexidbdatepicker.h"
 #include "kexidataawarewidgetinfo.h"
 #include <widget/dataviewcommon/kexiformdataiteminterface.h>
 
 #include <KDbConnection>
 
+#include <KPropertySet>
+
 #include <KActionCollection>
 #include <KLocalizedString>
 
+#include <QDomElement>
 #include <QStyle>
 #include <QFontMetrics>
-//////////////////////////////////////////
 
-KEXI_PLUGIN_FACTORY(KexiDBFactory, "kexiforms_dbwidgetsplugin.json")
+KEXI_PLUGIN_FACTORY(KexiMainFormWidgetsFactory, "kexiforms_mainwidgetsplugin.json")
 
-KexiDBFactory::KexiDBFactory(QObject *parent, const QVariantList &)
+KexiMainFormWidgetsFactory::KexiMainFormWidgetsFactory(QObject *parent, const QVariantList &)
         : KexiDBFactoryBase(parent)
         , m_assignAction(0)
 {
-    QByteArray parentFactory = "org.kexi-project.form.widgets.standard";
     {
         KexiDataAwareWidgetInfo *wi = new KexiDataAwareWidgetInfo(this);
         wi->setIconName(KexiIconName("form"));
         wi->setClassName("KexiDBForm");
         wi->setName(xi18nc("Form widget", "Form"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of forms. Based on that, identifiers such as "
                 "form1, form2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "form"));
         wi->setDescription(xi18n("A form widget"));
         addClass(wi);
     }
 
     {
-        // inherited
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("unknown-widget"));
+        wi->setClassName("CustomWidget");
+        wi->setName(/* no i18n needed */ "Custom Widget");
+        wi->setNamePrefix(/* no i18n needed */ "customWidget");
+        wi->setDescription(/* no i18n needed */ "A custom or non-supported widget");
+        addClass(wi);
+    }
+
+    {
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
         wi->setIconName(KexiIconName("lineedit"));
         wi->setClassName("KexiDBLineEdit");
-        wi->setParentFactoryName(parentFactory);
-        wi->setInheritedClassName("QLineEdit");
+        wi->addAlternateClassName("QLineEdit", true/*override*/);
         wi->addAlternateClassName("KLineEdit", true/*override*/);
-        wi->setIncludeFileName("qlineedit.h");
         wi->setName(xi18nc("Text Box widget", "Text Box"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of text box widgets. Based on that, identifiers such as "
                 "textBox1, textBox2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "textBox"));
         wi->setDescription(xi18n("A widget for entering and displaying line of text text"));
         wi->setInternalProperty("dontStartEditingOnInserting", true); // because we are most probably assign data source to this widget
         wi->setInlineEditingEnabledWhenDataSourceSet(false);
         addClass(wi);
     }
     {
-        // inherited
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
         wi->setIconName(KexiIconName("textedit"));
         wi->setClassName("KexiDBTextEdit");
-        wi->setParentFactoryName(parentFactory);
-        wi->setInheritedClassName("KTextEdit");
         wi->addAlternateClassName("QTextEdit", true/*override*/);
         wi->addAlternateClassName("KTextEdit", true/*override*/);
-        wi->setIncludeFileName("KTextEdit");
         wi->setName(xi18nc("Text Editor widget", "Text Editor"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of text editor widgets. Based on that, identifiers such as "
                 "textEditor1, textEditor2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "textEditor"));
         wi->setDescription(xi18n("A multiline text editor"));
         wi->setInternalProperty("dontStartEditingOnInserting", true); // because we are most probably assign data source to this widget
         wi->setInlineEditingEnabledWhenDataSourceSet(false);
         addClass(wi);
     }
-    {
-        KFormDesigner::WidgetInfo* wi = new KFormDesigner::WidgetInfo(this);
-        wi->setIconName(KexiIconName("frame"));
-        wi->setClassName("KexiFrame");
-        wi->setParentFactoryName(parentFactory);
-        wi->setInheritedClassName("QFrame"); /* we are inheriting to get i18n'd strings already translated there */
-        wi->addAlternateClassName("QFrame", true/*override*/);
-        wi->addAlternateClassName("Q3Frame", true/*override*/);
-        wi->setName(xi18nc("Frame widget", "Frame"));
-        wi->setNamePrefix(
-            xi18nc("A prefix for identifiers of frame widgets. Based on that, identifiers such as "
-                "frame1, frame2 are generated. "
-                "This string can be used to refer the widget object as variables in programming "
-                "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
-                "should start with lower case letter and if there are subsequent words, these should "
-                "start with upper case letter. Example: smallCamelCase. "
-                "Moreover, try to make this prefix as short as possible.",
-                "frame"));
-        wi->setDescription(xi18n("A frame widget"));
-        addClass(wi);
-    }
     {
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
         wi->setIconName(KexiIconName("label"));
         wi->setClassName("KexiDBLabel");
-        wi->setParentFactoryName(parentFactory);
-        wi->setInheritedClassName("QLabel"); /* we are inheriting to get i18n'd strings already translated there */
         wi->addAlternateClassName("QLabel", true/*override*/);
         wi->addAlternateClassName("KexiLabel", true/*override*/); //older
         wi->setName(xi18nc("Text Label widget", "Label"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of label widgets. Based on that, identifiers such as "
                 "label1, label2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "label"));
         wi->setDescription(xi18n("A widget for displaying text"));
         wi->setInlineEditingEnabledWhenDataSourceSet(false);
         addClass(wi);
     }
 
     {
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
         wi->setIconName(KexiIconName("imagebox"));
         wi->setClassName("KexiDBImageBox");
-        wi->setParentFactoryName(parentFactory);
-        wi->setInheritedClassName("KexiPictureLabel"); /* we are inheriting to get i18n'd strings already translated there */
         wi->addAlternateClassName("KexiPictureLabel", true/*override*/);
         wi->addAlternateClassName("KexiImageBox", true/*override*/); //older
         wi->setName(xi18nc("Image Box widget", "Image Box"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of image box widgets. Based on that, identifiers such as "
                 "image1, image2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "image"));
         wi->setDescription(xi18n("A widget for displaying images"));
     // wi->setCustomTypeForProperty("pixmapData", KexiCustomPropertyFactory::PixmapData);
         wi->setCustomTypeForProperty("pixmapId", KexiCustomPropertyFactory::PixmapId);
         wi->setInternalProperty("dontStartEditingOnInserting", true);
+        wi->setAutoSaveProperties(QList<QByteArray>() << "pixmap");
         addClass(wi);
     }
 
     {
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
         wi->setIconName(KexiIconName("combobox"));
         wi->setClassName("KexiDBComboBox");
-        wi->setParentFactoryName(parentFactory);
-        wi->setInheritedClassName("KComboBox"); /* we are inheriting to get i18n'd strings already translated there */
+        wi->addAlternateClassName("QComboBox", true/*override*/);
         wi->addAlternateClassName("KComboBox", true/*override*/);
         wi->setName(xi18nc("Combo Box widget", "Combo Box"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of combo box widgets. Based on that, identifiers such as "
                 "comboBox1, comboBox2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "comboBox"));
         wi->setDescription(xi18n("A combo box widget"));
         addClass(wi);
     }
     {
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
         wi->setIconName(KexiIconName("checkbox"));
         wi->setClassName("KexiDBCheckBox");
-        wi->setParentFactoryName(parentFactory);
-        wi->setInheritedClassName("QCheckBox"); /* we are inheriting to get i18n'd strings already translated there */
         wi->addAlternateClassName("QCheckBox", true/*override*/);
         wi->setName(xi18nc("Check Box widget", "Check Box"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of combo box widgets. Based on that, identifiers such as "
                 "checkBox1, checkBox2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "checkBox"));
         wi->setDescription(xi18n("A check box with text label"));
         addClass(wi);
     }
 #ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
     {
 // Unused, commented-out in Kexi 2.9 to avoid unnecessary translations:
 //         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
 //         wi->setIconName(KexiIconName("autofield"));
 //         wi->setClassName("KexiDBAutoField");
 //         wi->addAlternateClassName("KexiDBFieldEdit", true/*override*/); //older
 //         wi->setName(xi18n("Auto Field"));
 //         wi->setNamePrefix(
 //             i18nc("Widget name. This string will be used to name widgets of this class. "
 //                   "It must _not_ contain white spaces and non latin1 characters", "autoField"));
 //         wi->setDescription(xi18n("A widget containing an automatically selected editor "
 //                                 "and a label to edit the value of a database field of any type."));
 //         addClass(wi);
     }
 #endif
 
     {
-        // inherited
         KFormDesigner::WidgetInfo* wi = new KFormDesigner::WidgetInfo(this);
         wi->setClassName("KexiDBPushButton");
         wi->setIconName(KexiIconName("button"));
         wi->addAlternateClassName("KexiPushButton", true/*override*/);
+        wi->addAlternateClassName("QPushButton", true/*override*/);
         wi->setName(xi18nc("Button widget", "Button"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of button widgets. Based on that, identifiers such as "
                 "button1, button2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "button"));
         wi->setDescription(xi18n("A button for executing actions"));
-        wi->setParentFactoryName(parentFactory);
-        wi->setInheritedClassName("QPushButton");
         addClass(wi);
     }
     {
         KFormDesigner::WidgetInfo* wi = new KFormDesigner::WidgetInfo(this);
         wi->setClassName("KexiDBCommandLinkButton");
         wi->setIconName(KexiIconName("button"));
         wi->setName(xi18nc("Link Button widget", "Link Button"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of link button widgets. Based on that, identifiers such as "
                 "linkButton1, linkButton2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "linkButton"));
         wi->setDescription(xi18n("A Link button for executing actions"));
         addClass(wi);
     }
+    //! @todo radio button
+#ifdef KEXI_SHOW_UNFINISHED
+    {
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("radiobutton"));
+        wi->setClassName("QRadioButton");
+        wi->setName(/* no i18n needed */ "Option Button");
+        wi->setNamePrefix(/* no i18n needed */ "option");
+        wi->setDescription(/* no i18n needed */ "An option button with text or pixmap label");
+        addClass(wi);
+    }
+    {
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("spinbox"));
+        wi->setClassName("QSpinBox");
+        wi->addAlternateClassName("KIntSpinBox");
+        wi->setName(/* no i18n needed */ "Spin Box");
+        wi->setNamePrefix(/* no i18n needed */ "spinBox");
+        wi->setDescription(/* no i18n needed */ "A spin box widget");
+        addClass(wi);
+    }
+#endif
     {
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
-        wi->setIconName(KexiIconName("slider"));
         wi->setClassName("KexiDBSlider");
+        wi->setIconName(KexiIconName("slider"));
+        wi->addAlternateClassName("QSlider", true/*override*/);
         wi->setName(xi18nc("Slider widget", "Slider"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of slider widgets. Based on that, identifiers such as "
                 "slider1, slider2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "slider"));
         wi->setDescription(xi18n("A Slider widget"));
         addClass(wi);
     }
     {
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
-        wi->setIconName(KexiIconName("progressbar"));
         wi->setClassName("KexiDBProgressBar");
+        wi->setIconName(KexiIconName("progressbar"));
+        wi->addAlternateClassName("QProgressBar", true/*override*/);
         wi->setName(xi18nc("Progress Bar widget", "Progress Bar"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of progress bar widgets. Based on that, identifiers such as "
                 "progressBar1, progressBar2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "progressBar"));
         wi->setDescription(xi18n("A Progress Bar widget"));
         addClass(wi);
     }
+    {
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("line-horizontal"));
+        wi->setClassName("KexiLineWidget");
+        wi->addAlternateClassName("Line", true/*override*/);
+        wi->setName(xi18n("Line"));
+        wi->setNamePrefix(
+            xi18nc("A prefix for identifiers of line widgets. Based on that, identifiers such as "
+                "line1, line2 are generated. "
+                "This string can be used to refer the widget object as variables in programming "
+                "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
+                "should start with lower case letter and if there are subsequent words, these should "
+                "start with upper case letter. Example: smallCamelCase. "
+                "Moreover, try to make this prefix as short as possible.",
+                "line"));
+        wi->setDescription(xi18n("A line to be used as a separator"));
+        wi->setAutoSaveProperties(QList<QByteArray>() << "orientation");
+        wi->setInternalProperty("orientationSelectionPopup", true);
+        wi->setInternalProperty("orientationSelectionPopup:horizontalIcon", KexiIconName("line-horizontal"));
+        wi->setInternalProperty("orientationSelectionPopup:verticalIcon", KexiIconName("line-vertical"));
+        wi->setInternalProperty("orientationSelectionPopup:horizontalText", xi18n("Insert &Horizontal Line"));
+        wi->setInternalProperty("orientationSelectionPopup:verticalText", xi18n("Insert &Vertical Line"));
+        addClass(wi);
+    }
     {
         KexiDataAwareWidgetInfo* wi = new KexiDataAwareWidgetInfo(this);
-        wi->setIconName(KexiIconName("dateedit"));
         wi->setClassName("KexiDBDatePicker");
+        wi->setIconName(KexiIconName("dateedit"));
+        wi->addAlternateClassName("QDateEdit", true/*override*/);
+        wi->addAlternateClassName("KDateWidget", true/*override*/);
         wi->setName(xi18nc("Date Picker widget", "Date Picker"));
         wi->setNamePrefix(
             xi18nc("A prefix for identifiers of date picker widgets. Based on that, identifiers such as "
                 "datePicker1, datePicker2 are generated. "
                 "This string can be used to refer the widget object as variables in programming "
                 "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
                 "should start with lower case letter and if there are subsequent words, these should "
                 "start with upper case letter. Example: smallCamelCase. "
                 "Moreover, try to make this prefix as short as possible.",
                 "datePicker"));
         wi->setDescription(xi18n("A Date Picker widget"));
         addClass(wi);
     }
+    //! @todo time edit
+#ifdef KEXI_SHOW_UNFINISHED
+    {
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("timeedit"));
+        wi->setClassName("QTimeEdit");
+        wi->addAlternateClassName("KTimeWidget");
+        wi->setName(/* no i18n needed */ "Time Widget");
+        wi->setNamePrefix(/* no i18n needed */ "timeWidget");
+        wi->setDescription(/* no i18n needed */ "A widget to input and display a time");
+        wi->setAutoSaveProperties(QList<QByteArray>() << "time");
+        addClass(wi);
+    }
+#endif
+    //! @todo datetime edit
+#ifdef KEXI_SHOW_UNFINISHED
+    {
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("datetimeedit"));
+        wi->setClassName("QDateTimeEdit");
+        wi->addAlternateClassName("KDateTimeWidget");
+        wi->setName(/* no i18n needed */ "Date/Time Widget");
+        wi->setNamePrefix(/* no i18n needed */ "dateTimeWidget");
+        wi->setDescription(/* no i18n needed */ "A widget to input and display a time and a date");
+        wi->setAutoSaveProperties(QList<QByteArray>() << "dateTime");
+        addClass(wi);
+    }
+#endif
+
+    setPropertyDescription("echoMode",
+        xi18nc("Property: Echo mode for Line Edit widget eg. Normal, NoEcho, Password", "Echo Mode"));
+    setPropertyDescription("indent", xi18n("Indent"));
 
     setPropertyDescription("invertedAppearance", xi18n("Inverted"));
     setPropertyDescription("minimum", xi18n("Minimum"));
     setPropertyDescription("maximum", xi18n("Maximum"));
     setPropertyDescription("format", xi18n("Format"));
     setPropertyDescription("orientation", xi18n("Orientation"));
     setPropertyDescription("textDirection", xi18n("Text Direction"));
     setPropertyDescription("textVisible", xi18n("Text Visible"));
     setPropertyDescription("value", xi18n("Value"));
     setPropertyDescription("date", xi18n("Date"));
     setPropertyDescription("arrowVisible", xi18n("Arrow Visible"));
     setPropertyDescription("description", xi18n("Description"));
     setPropertyDescription("pageStep", xi18nc("Property of slider widgets", "Page Step"));
     setPropertyDescription("singleStep", xi18nc("Property of slider widgets", "Single Step"));
     setPropertyDescription("tickInterval", xi18nc("Property of slider widgets", "Tick Interval"));
     setPropertyDescription("tickPosition", xi18nc("Property of slider widgets", "Tick Position"));
     setPropertyDescription("showEditor", xi18n("Show Editor"));
     setPropertyDescription("formName", xi18n("Form Name"));
     setPropertyDescription("onClickAction", xi18n("On Click"));
     setPropertyDescription("onClickActionOption", xi18n("On Click Option"));
     setPropertyDescription("autoTabStops", xi18n("Auto Tab Order"));
     setPropertyDescription("checkSpellingEnabled", xi18n("Spell Checking"));
     setPropertyDescription("html", xi18nc("Widget Property", "HTML"));
     setPropertyDescription("lineWrapColumnOrWidth", xi18n("Line Wrap At"));
     setPropertyDescription("lineWrapMode", xi18n("Line Wrap Mode"));
     setPropertyDescription("spellCheckingLanguage", xi18n("Spell Checking Language"));
 
     setPropertyDescription("widgetType", xi18n("Editor Type"));
 #ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
     //for autofield's type: inherit i18n from KDb
     setValueDescription("Auto", futureI18nc("AutoField editor's type", "Auto"));
     setValueDescription("Text", KDbField::typeName(KDbField::Text));
     setValueDescription("Integer", KDbField::typeName(KDbField::Integer));
     setValueDescription("Double", KDbField::typeName(KDbField::Double));
     setValueDescription("Boolean", KDbField::typeName(KDbField::Boolean));
     setValueDescription("Date", KDbField::typeName(KDbField::Date));
     setValueDescription("Time", KDbField::typeName(KDbField::Time));
     setValueDescription("DateTime", KDbField::typeName(KDbField::DateTime));
     setValueDescription("MultiLineText", xi18nc("AutoField editor's type", "Multiline Text"));
     setValueDescription("ComboBox", xi18nc("AutoField editor's type", "Drop-Down List"));
     setValueDescription("Image", xi18nc("AutoField editor's type", "Image"));
 #endif
 
     setValueDescription("NoTicks", xi18nc("Possible value of slider widget's \"Tick position\" property", "No Ticks"));
     setValueDescription("TicksAbove", xi18nc("Possible value of slider widget's \"Tick position\" property", "Above"));
     setValueDescription("TicksLeft", xi18nc("Possible value of slider widget's \"Tick position\" property", "Left"));
     setValueDescription("TicksBelow", xi18nc("Possible value of slider widget's \"Tick position\" property", "Below"));
     setValueDescription("TicksRight", xi18nc("Possible value of slider widget's \"Tick position\" property", "Right"));
     setValueDescription("TicksBothSides", xi18nc("Possible value of slider widget's \"Tick position\" property", "Both Sides"));
 
 // auto field:
 //    setPropertyDescription("autoCaption", futureI18n("Auto Label"));
 //    setPropertyDescription("foregroundLabelColor", futureI18n("Label Text Color"));
 //    setPropertyDescription("backgroundLabelColor", futureI18nc("(a property name, keep the text narrow!)",
 //                                         "Label Background\nColor"));
 
 //    setPropertyDescription("labelPosition", futureI18n("Label Position"));
 //    setValueDescription("Left", futureI18nc("Label Position", "Left"));
 //    setValueDescription("Top", futureI18nc("Label Position", "Top"));
 //    setValueDescription("NoLabel", futureI18nc("Label Position", "No Label"));
 
     setPropertyDescription("sizeInternal", xi18n("Size"));
     setPropertyDescription("pixmapId", xi18n("Image"));
     setPropertyDescription("scaledContents", xi18n("Scaled Contents"));
     setPropertyDescription("smoothTransformation", xi18nc("Property: Smoothing when contents are scaled", "Smoothing"));
     setPropertyDescription("keepAspectRatio", xi18nc("Property: Keep Aspect Ratio (keep short)", "Keep Ratio"));
 
-    //hide classes that are replaced by db-aware versions
-    hideClass("KexiPictureLabel");
-    hideClass("KComboBox");
-
     //used in labels, frames...
     setPropertyDescription("dropDownButtonVisible",
         xi18nc("Drop-Down Button for Image Box Visible (a property name, keep the text narrow!)",
               "Drop-Down\nButton Visible"));
 
     //for checkbox
+    setPropertyDescription("checked", xi18nc("Property: Checked checkbox", "Checked"));
+    setPropertyDescription("tristate", xi18nc("Property: Tristate checkbox", "Tristate"));
     setValueDescription("TristateDefault", xi18nc("Value of \"Tristate\" property in checkbox: default", "Default"));
     setValueDescription("TristateOn", xi18nc("Value of \"Tristate\" property in checkbox: yes", "Yes"));
     setValueDescription("TristateOff", xi18nc("Value of \"Tristate\" property in checkbox: no", "No"));
 
     //for combobox
     setPropertyDescription("editable", xi18nc("Editable combobox", "Editable"));
 
-    //for kexipushbutton
+    //for button
+    setPropertyDescription("checkable", xi18nc("Property: Button is checkable", "On/Off"));
+    setPropertyDescription("autoRepeat", xi18nc("Property: Button", "Auto Repeat"));
+    setPropertyDescription("autoRepeatDelay", xi18nc("Property: Auto Repeat Button's Delay", "Auto Rep. Delay"));
+    setPropertyDescription("autoRepeatInterval", xi18nc("Property: Auto Repeat Button's Interval", "Auto Rep. Interval"));
+    // unused (too advanced) setPropertyDescription("autoDefault", xi18n("Auto Default"));
+    // unused (too advanced) setPropertyDescription("default", xi18nc("Property: Button is default", "Default"));
+    setPropertyDescription("flat", xi18nc("Property: Button is flat", "Flat"));
     setPropertyDescription("hyperlink" , xi18nc("Hyperlink address", "Hyperlink"));
     setPropertyDescription("hyperlinkType", xi18nc("Type of hyperlink", "Hyperlink Type"));
     setPropertyDescription("hyperlinkTool", xi18nc("Tool used for opening a hyperlink", "Hyperlink Tool"));
     setPropertyDescription("remoteHyperlink", xi18nc("Allow to open remote hyperlinks", "Remote Hyperlink"));
     setPropertyDescription("hyperlinkExecutable", xi18nc("Allow to open executables", "Executable Hyperlink"));
 
     setValueDescription("NoHyperlink", xi18nc("Hyperlink type, NoHyperlink", "No Hyperlink"));
     setValueDescription("StaticHyperlink", xi18nc("Hyperlink type, StaticHyperlink", "Static"));
     setValueDescription("DynamicHyperlink", xi18nc("Hyperlink type, DynamicHyperlink", "Dynamic"));
 
     setValueDescription("DefaultHyperlinkTool", xi18nc("Hyperlink tool, DefaultTool", "Default"));
     setValueDescription("BrowserHyperlinkTool", xi18nc("Hyperlink tool, BrowserTool", "Browser"));
     setValueDescription("MailerHyperlinkTool", xi18nc("Hyperlink tool, MailerTool", "Mailer"));
+
+    //for label
+    setPropertyDescription("textFormat", xi18n("Text Format"));
+    setValueDescription("PlainText", xi18nc("For Text Format", "Plain"));
+    setValueDescription("RichText", xi18nc("For Text Format", "Hypertext"));
+    setValueDescription("AutoText", xi18nc("For Text Format", "Auto"));
+    setValueDescription("LogText", xi18nc("For Text Format", "Log"));
+    setPropertyDescription("openExternalLinks", xi18nc("property: Can open external links in label", "Open Ext. Links"));
+
+    //for line edit
+    setPropertyDescription("placeholderText", xi18nc("Property: line edit's placeholder text", "Placeholder Text"));
+    setPropertyDescription("clearButtonEnabled", xi18nc("Property: Clear Button Enabled", "Clear Button"));
+    //for EchoMode
+    setPropertyDescription("passwordMode", xi18nc("Property: Password Mode for line edit", "Password Mode"));
+    setPropertyDescription("squeezedTextEnabled", xi18nc("Property: Squeezed Text Mode for line edit", "Squeezed Text"));
+
+    // text edit
+    setPropertyDescription("tabStopWidth", xi18n("Tab Stop Width"));
+    setPropertyDescription("tabChangesFocus", xi18n("Tab Changes Focus"));
+    setPropertyDescription("wrapPolicy", xi18n("Word Wrap Policy"));
+    setValueDescription("AtWordBoundary", xi18nc("Property: For Word Wrap Policy", "At Word Boundary"));
+    setValueDescription("Anywhere", xi18nc("Property: For Word Wrap Policy", "Anywhere"));
+    setValueDescription("AtWordOrDocumentBoundary", xi18nc("Property: For Word Wrap Policy", "At Word Boundary If Possible"));
+    setPropertyDescription("wordWrap", xi18n("Word Wrapping"));
+    setPropertyDescription("wrapColumnOrWidth", xi18n("Word Wrap Position"));
+    setValueDescription("NoWrap", xi18nc("Property: For Word Wrap Position", "None"));
+    setValueDescription("WidgetWidth", xi18nc("Property: For Word Wrap Position", "Widget's Width"));
+    setValueDescription("FixedPixelWidth", xi18nc("Property: For Word Wrap Position", "In Pixels"));
+    setValueDescription("FixedColumnWidth", xi18nc("Property: For Word Wrap Position", "In Columns"));
+    setPropertyDescription("linkUnderline", xi18n("Links Underlined"));
+    setPropertyDescription("horizontalScrollBarPolicy", xi18n("Horizontal Scroll Bar"));
+    setPropertyDescription("verticalScrollBarPolicy", xi18n("Vertical Scroll Bar"));
+    //ScrollBarPolicy
+    setValueDescription("ScrollBarAsNeeded", xi18nc("Property: Show Scroll Bar As Needed", "As Needed"));
+    setValueDescription("ScrollBarAlwaysOff", xi18nc("Property: Scroll Bar Always Off", "Always Off"));
+    setValueDescription("ScrollBarAlwaysOn", xi18nc("Property: Scroll Bar Always On", "Always On"));
+    setPropertyDescription("acceptRichText", xi18nc("Property: Text Edit accepts rich text", "Rich Text"));
+    setPropertyDescription("HTML", xi18nc("Property: HTML value of text edit", "HTML"));
+
+    // --- containers ---
+    {
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("tabwidget"));
+        wi->setClassName("KFDTabWidget");
+        wi->addAlternateClassName("KTabWidget");
+        wi->addAlternateClassName("QTabWidget");
+        wi->setSavingName("QTabWidget");
+        wi->setName(xi18n("Tab Widget"));
+        wi->setNamePrefix(
+            xi18nc("A prefix for identifiers of tab widgets. Based on that, identifiers such as "
+                  "tab1, tab2 are generated. "
+                  "This string can be used to refer the widget object as variables in programming "
+                  "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
+                  "should start with lower case letter and if there are subsequent words, these should "
+                  "start with upper case letter. Example: smallCamelCase. "
+                  "Moreover, try to make this prefix as short as possible.",
+                  "tabWidget"));
+        wi->setDescription(xi18n("A widget to display multiple pages using tabs"));
+        addClass(wi);
+    }
+    {
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("frame"));
+        wi->setClassName("QWidget");
+        wi->addAlternateClassName("ContainerWidget");
+        wi->setName(/* no i18n needed */ "Basic container");
+        wi->setNamePrefix(/* no i18n needed */ "container");
+        wi->setDescription(/* no i18n needed */ "An empty container with no frame");
+        addClass(wi);
+    }
+    {
+        KFormDesigner::WidgetInfo* wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("frame"));
+        wi->setClassName("KexiFrame");
+        wi->addAlternateClassName("QFrame", true/*override*/);
+        wi->addAlternateClassName("Q3Frame", true/*override*/);
+        wi->setName(xi18nc("Frame widget", "Frame"));
+        wi->setNamePrefix(
+            xi18nc("A prefix for identifiers of frame widgets. Based on that, identifiers such as "
+                "frame1, frame2 are generated. "
+                "This string can be used to refer the widget object as variables in programming "
+                "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
+                "should start with lower case letter and if there are subsequent words, these should "
+                "start with upper case letter. Example: smallCamelCase. "
+                "Moreover, try to make this prefix as short as possible.",
+                "frame"));
+        wi->setDescription(xi18n("A frame widget"));
+        addClass(wi);
+    }
+    {
+        KFormDesigner::WidgetInfo *wi = new KFormDesigner::WidgetInfo(this);
+        wi->setIconName(KexiIconName("groupbox"));
+        wi->setClassName("QGroupBox");
+        wi->addAlternateClassName("GroupBox");
+        wi->setName(xi18n("Group Box"));
+        wi->setNamePrefix(
+            xi18nc("A prefix for identifiers of group box widgets. Based on that, identifiers such as "
+                  "groupBox1, groupBox2 are generated. "
+                  "This string can be used to refer the widget object as variables in programming "
+                  "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
+                  "should start with lower case letter and if there are subsequent words, these should "
+                  "start with upper case letter. Example: smallCamelCase. "
+                  "Moreover, try to make this prefix as short as possible.",
+                  "groupBox"));
+        wi->setDescription(xi18n("A container to group some widgets"));
+        addClass(wi);
+    }
+
+    //groupbox
+    setPropertyDescription("title", xi18nc("'Title' property for group box", "Title"));
+    setPropertyDescription("flat", xi18nc("'Flat' property for group box", "Flat"));
+
+    //tab widget
+    setPropertyDescription("tabBarAutoHide", xi18n("Auto-hide Tabs"));
+    setPropertyDescription("tabPosition", xi18n("Tab Position"));
+    setPropertyDescription("currentIndex", xi18nc("'Current page' property for tab widget", "Current Page"));
+    setPropertyDescription("tabShape", xi18n("Tab Shape"));
+    setPropertyDescription("elideMode", xi18nc("Tab Widget's Elide Mode property", "Elide Mode"));
+    setPropertyDescription("usesScrollButtons",
+                           xi18nc("Tab Widget's property: true if can use scroll buttons", "Scroll Buttons"));
+
+    setPropertyDescription("tabsClosable", xi18n("Closable Tabs"));
+    setPropertyDescription("movable", xi18n("Movable Tabs"));
+    setPropertyDescription("documentMode", xi18n("Document Mode"));
+
+    setValueDescription("Rounded", xi18nc("Property value for Tab Shape", "Rounded"));
+    setValueDescription("Triangular", xi18nc("Property value for Tab Shape", "Triangular"));
 }
 
-KexiDBFactory::~KexiDBFactory()
+KexiMainFormWidgetsFactory::~KexiMainFormWidgetsFactory()
 {
 }
 
 QWidget*
-KexiDBFactory::createWidget(const QByteArray &c, QWidget *p, const char *n,
+KexiMainFormWidgetsFactory::createWidget(const QByteArray &c, QWidget *p, const char *n,
                             KFormDesigner::Container *container,
                             CreateWidgetOptions options)
 {
     QWidget *w = 0;
-    QString text(container->form()->library()->textForWidgetName(n, c));
+    const QString text(container->form()->library()->textForWidgetName(n, c));
     const bool designMode = options & KFormDesigner::WidgetFactory::DesignViewMode;
     bool createContainer = false;
 
-    if (c == "KexiDBLineEdit") {
+    if (c == "KexiDBLineEdit" || c == "QLineEdit") {
         w = new KexiDBLineEdit(p);
     }
-    else if (c == "KexiDBTextEdit") {
+    else if (c == "KexiDBTextEdit" || c == "KTextEdit") {
         w = new KexiDBTextEdit(p);
     }
     else if (c == "Q3Frame" || c == "QFrame" || c == "KexiFrame") {
         w = new KexiFrame(p);
         createContainer = true;
-    } else if (c == "KexiDBLabel") {
+    } else if (c == "KexiDBLabel" || c == "QLabel") {
         w = new KexiDBLabel(text, p);
     }
-    else if (c == "KexiDBImageBox") {
+    else if (c == "KexiDBImageBox" || c == "KexiPictureLabel") {
         w = new KexiDBImageBox(designMode, p);
         connect(w, SIGNAL(idChanged(long)), this, SLOT(slotImageBoxIdChanged(long)));
     }
 #ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
     else if (c == "KexiDBAutoField") {
         w = new KexiDBAutoField(p);
     }
 #endif
-    else if (c == "KexiDBCheckBox") {
+    else if (c == "KexiDBCheckBox" || c == "QCheckBox") {
         w = new KexiDBCheckBox(text, p);
     }
-    else if (c == "KexiDBSlider") {
+    else if (c == "KexiDBSlider" || c == "QSlider") {
         w = new KexiDBSlider(p);
-    } else if (c == "KexiDBProgressBar") {
+    } else if (c == "KexiDBProgressBar" || c == "QProgressBar") {
         w = new KexiDBProgressBar(p);
-    } else if (c == "KexiDBDatePicker") {
+    } else if (c == "KexiDBDatePicker" || c == "KDateWidget" || c == "QDateEdit") {
         w = new KexiDBDatePicker(p);
     }
-    else if (c == "KexiDBComboBox") {
+    else if (c == "KexiDBComboBox" || c == "KComboBox") {
         w = new KexiDBComboBox(p);
     }
     else if (c == "QPushButton" || c == "KPushButton" || c == "KexiDBPushButton" || c == "KexiPushButton") {
         w = new KexiDBPushButton(text, p);
     }
     else if (c == "KexiDBCommandLinkButton" || c == "KexiCommandLinkButton") {
         w = new KexiDBCommandLinkButton(text, QString(), p);
     }
+#ifdef KEXI_SHOW_UNFINISHED
+    else if (c == "QRadioButton") {
+        w = new QRadioButton(text, p);
+    } else if (c == "KIntSpinBox" || c == "QSpinBox") {
+        w = new QSpinBox(p);
+    }
+#endif
+#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
+    else if (c == "QTreeWidget") {
+            QTreeWidget *tw = new QTreeWidget(p);
+            w = tw;
+            if (container->form()->interactiveMode()) {
+                tw->setColumnCount(1);
+                tw->setHeaderItem(new QTreeWidetItem(tw));
+                tw->headerItem()->setText(1, futureI18n("Column 1"));
+            }
+            lw->setRootIsDecorated(true);
+    } else if (c == "KTimeWidget" || c == "QTimeEdit") {
+       w = new QTimeEdit(QTime::currentTime(), p);
+    } else if (c == "KDateTimeWidget" || c == "QDateTimeEdit") {
+        w = new QDateTimeEdit(QDateTime::currentDateTime(), p);
+    }
+#endif
+    else if (c == "KexiLineWidget" || c == "Line") {
+        w = new KexiLineWidget(options & WidgetFactory::VerticalOrientation
+                ? Qt::Vertical : Qt::Horizontal, p);
+    } // --- containers ---
+    else if (c == "KFDTabWidget") {
+        KFDTabWidget *tab = new KFDTabWidget(container, p);
+        w = tab;
+#if defined(USE_KTabWidget)
+        tab->setTabReorderingEnabled(true);
+        connect(tab, SIGNAL(movedTab(int,int)), this, SLOT(reorderTabs(int,int)));
+#endif
+        //qDebug() << "Creating ObjectTreeItem:";
+        container->form()->objectTree()->addItem(container->objectTree(),
+            new KFormDesigner::ObjectTreeItem(
+                container->form()->library()->displayName(c), n, tab, container));
+    } else if (c == "QWidget") {
+        w = new ContainerWidget(p);
+        w->setObjectName(n);
+        (void)new KFormDesigner::Container(container, w, p);
+        return w;
+    } else if (c == "QGroupBox") {
+        w = new GroupBox(text, p);
+        createContainer = true;
+    }
 
     if (w)
         w->setObjectName(n);
-    if (createContainer)
+    if (createContainer) {
         (void)new KFormDesigner::Container(container, w, container);
+    }
+    if (c == "KFDTabWidget") {
+        // if we are loading, don't add this tab
+        if (container->form()->interactiveMode()) {
+            TabWidgetBase *tab = qobject_cast<TabWidgetBase*>(w);
+            AddTabAction(container, tab, 0).slotTriggered();
+        }
+    }
     return w;
 }
 
-bool KexiDBFactory::createMenuActions(const QByteArray &classname, QWidget *w, QMenu *menu,
-                                      KFormDesigner::Container *)
+bool KexiMainFormWidgetsFactory::createMenuActions(const QByteArray &classname, QWidget *w,
+        QMenu *menu, KFormDesigner::Container *container)
 {
+    QWidget *pw = w->parentWidget();
     if (m_assignAction->isEnabled()) {
         /*! @todo also call createMenuActions() for inherited factory! */
         menu->addAction(m_assignAction);
         return true;
     } else if (classname == "KexiDBImageBox") {
         KexiDBImageBox *imageBox = static_cast<KexiDBImageBox*>(w);
         imageBox->contextMenu()->updateActionsAvailability();
         KActionCollection *ac = imageBox->contextMenu()->actionCollection();
         QMenu *subMenu = menu->addMenu(xi18n("&Image"));
 //! @todo make these actions undoable/redoable
         subMenu->addAction(ac->action("insert"));
         subMenu->addAction(ac->action("file_save_as"));
         subMenu->addSeparator();
         subMenu->addAction(ac->action("edit_cut"));
         subMenu->addAction(ac->action("edit_copy"));
         subMenu->addAction(ac->action("edit_paste"));
         subMenu->addAction(ac->action("delete"));
         if (ac->action("properties")) {
             subMenu->addSeparator();
             subMenu->addAction(ac->action("properties"));
         }
+    } else if (classname == "KexiDBLabel" || classname == "KexiDBTextEdit") {
+        menu->addAction( new EditRichTextAction(container, w, menu, this) );
+        return true;
+    }
+#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
+    else if (classname == "QTreeWidget") {
+        menu->addAction(koIcon("document-properties"), futureI18n("Edit Contents of List Widget"),
+            this, SLOT(editListContents()));
+        return true;
+    }
+#endif
+    else if (classname == "KFDTabWidget" || pw->parentWidget()->inherits("QTabWidget")) {
+//! @todo KEXI3 port this: setWidget(pw->parentWidget(), m_container->toplevel());
+#if 0
+        if (pw->parentWidget()->inherits("QTabWidget")) {
+            setWidget(pw->parentWidget(), m_container->toplevel());
+        }
+#endif
+        TabWidgetBase *tab = qobject_cast<TabWidgetBase*>(w);
+        if (tab) {
+            menu->addAction( new AddTabAction(container, tab, menu) );
+            menu->addAction( new RenameTabAction(container, tab, menu) );
+            menu->addAction( new RemoveTabAction(container, tab, menu) );
+        }
+        return true;
     }
     return false;
 }
 
 void
-KexiDBFactory::createCustomActions(KActionCollection* col)
+KexiMainFormWidgetsFactory::createCustomActions(KActionCollection* col)
 {
     //this will create shared instance action for design mode (special collection is provided)
     col->addAction("widget_assign_action",
                    m_assignAction = new QAction(KexiIcon("form-action"), xi18n("&Assign Action..."), this));
 }
 
 bool
-KexiDBFactory::startInlineEditing(InlineEditorCreationArguments& args)
+KexiMainFormWidgetsFactory::startInlineEditing(InlineEditorCreationArguments& args)
 {
     const KFormDesigner::WidgetInfo* wclass = args.container->form()->library()->widgetInfoForClassName(args.classname);
     const KexiDataAwareWidgetInfo* wDataAwareClass = dynamic_cast<const KexiDataAwareWidgetInfo*>(wclass);
     if (wDataAwareClass && !wDataAwareClass->inlineEditingEnabledWhenDataSourceSet()) {
         KexiFormDataItemInterface* iface = dynamic_cast<KexiFormDataItemInterface*>(args.widget);
         if (iface && !iface->dataSource().isEmpty()) {
 //! @todo reimplement inline editing for KexiDBLineEdit using combobox with data sources
             return false;
         }
     }
 
     if (args.classname == "KexiDBLineEdit") {
-//! @todo this code should not be copied here but
-//! just inherited KexiStandardFormWidgetsFactory::startInlineEditing() should be called
-
         QLineEdit *lineedit = static_cast<QLineEdit*>(args.widget);
         args.text = lineedit->text();
         args.alignment = lineedit->alignment();
         args.useFrame = true;
         return true;
     }
     else if (args.classname == "KexiDBTextEdit") {
-//! @todo this code should not be copied here but
-//! just inherited KexiStandardFormWidgetsFactory::startInlineEditing() should be called
         KTextEdit *textedit = static_cast<KTextEdit*>(args.widget);
 //! @todo rich text?
         args.text = textedit->toPlainText();
         args.alignment = textedit->alignment();
         args.useFrame = true;
         args.multiLine = true;
 //! @todo
 #if 0
         //copy a few properties
         KTextEdit *ed = dynamic_cast<KTextEdit *>(editor(w));
         ed->setLineWrapMode(textedit->lineWrapMode());
         ed->setLineWrapColumnOrWidth(textedit->lineWrapColumnOrWidth());
         ed->setWordWrapMode(textedit->wordWrapMode());
         ed->setTabStopWidth(textedit->tabStopWidth());
         ed->setTextFormat(textedit->textFormat());
         ed->setHorizontalScrollBarPolicy(textedit->horizontalScrollBarPolicy());
         ed->setVerticalScrollBarPolicy(textedit->verticalScrollBarPolicy());
 #endif
         return true;
     }
-    // KexiDBCommandLinkButton
+    else if (args.classname == "KexiDBPushButton") {
+        KexiDBPushButton *push = static_cast<KexiDBPushButton*>(args.widget);
+        QStyleOptionButton option;
+        option.initFrom(push);
+        args.text = push->text();
+        const QRect r(push->style()->subElementRect(
+                          QStyle::SE_PushButtonContents, &option, push));
+        args.geometry = QRect(push->x() + r.x(), push->y() + r.y(), r.width(), r.height());
+//! @todo this is typical alignment, can we get actual from the style?
+        args.alignment = Qt::AlignCenter;
+        //args.transparentBackground = true;
+        return true;
+    }
     else if (args.classname == "KexiDBCommandLinkButton" ){
-        KexiDBCommandLinkButton *linkButton=static_cast<KexiDBCommandLinkButton*>(args.widget);
-        QStyleOption option;
+        KexiDBCommandLinkButton *linkButton = static_cast<KexiDBCommandLinkButton*>(args.widget);
+        QStyleOptionButton option;
         option.initFrom(linkButton);
         args.text = linkButton->text();
         const QRect r(linkButton->style()->subElementRect(
                         QStyle::SE_PushButtonContents, &option, linkButton));
 
         QFontMetrics fm(linkButton->font());
-        args.geometry = QRect(linkButton->x() + linkButton->iconSize().width() + 6, linkButton->y() + r.y(), r.width()  - 6, fm.height()+14);
-
+        args.geometry = QRect(linkButton->x() + linkButton->iconSize().width() + 6,
+                              linkButton->y() + r.y(),
+                              r.width()  - 6 - linkButton->iconSize().width(),
+                              std::min(fm.height() + 14, linkButton->height() - 4));
         return true;
     }
+#ifdef KEXI_SHOW_UNFINISHED
+    else if (args.classname == "QRadioButton") {
+        QRadioButton *radio = static_cast<QRadioButton*>(args.widget);
+        QStyleOptionButton option;
+        option.initFrom(radio);
+        args.text = radio->text();
+        const QRect r(radio->style()->subElementRect(
+                          QStyle::SE_RadioButtonContents, &option, radio));
+        args.geometry = QRect(
+            radio->x() + r.x(), radio->y() + r.y(), r.width(), r.height());
+        return true;
+    }
+#endif
     else if (args.classname == "KexiDBLabel") {
         KexiDBLabel *label = static_cast<KexiDBLabel*>(args.widget);
         if (label->textFormat() == Qt::RichText) {
             args.execute = false;
-            if (wclass && wclass->inheritedClass()) {
-                const QByteArray thisClassname = args.classname; //save
-                args.classname = wclass->inheritedClass()->className();
-//! @todo OK?
-                const bool result = wclass->inheritedClass()->factory()->startInlineEditing(args);
-                args.classname = thisClassname;
-                return result;
-            }
-            else {
-                return false;
-            }
-        }
-        else {
+            EditRichTextAction(args.container, label, nullptr, this).trigger();
+//! @todo
+        } else {
             args.text = label->text();
             args.alignment = label->alignment();
             args.multiLine = label->wordWrap();
         }
         return true;
     }
-#if 0
     else if (   args.classname == "KexiDBDateEdit" || args.classname == "KexiDBDateTimeEdit"
-             || args.classname == "KexiDBTimeEdit" /*|| classname == "KexiDBIntSpinBox" || classname == "KexiDBDoubleSpinBox"*/)
+             /*|| args.classname == "KexiDBTimeEdit" || classname == "KexiDBIntSpinBox" || classname == "KexiDBDoubleSpinBox"*/)
     {
-        disableFilter(w, container);
+        disableFilter(args.widget, args.container);
         return true;
     }
-#endif
+#ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
     else if (args.classname == "KexiDBAutoField") {
         if (static_cast<KexiDBAutoField*>(args.widget)->hasAutoCaption())
             return false; // caption is auto, abort editing
         QLabel *label = static_cast<KexiDBAutoField*>(args.widget)->label();
         args.text = label->text();
         args.widget = label;
         args.geometry = label->geometry();
         args.alignment = label->alignment();
         return true;
     }
+#endif
     else if (args.classname == "KexiDBCheckBox") {
         KexiDBCheckBox *cb = static_cast<KexiDBCheckBox*>(args.widget);
-        QStyleOption option;
+        QStyleOptionButton option;
         option.initFrom(cb);
         QRect r(cb->geometry());
         r.setLeft(
             r.left() + 2
             + cb->style()->subElementRect(QStyle::SE_CheckBoxIndicator, &option, cb).width());
         args.text = cb->text();
         args.geometry = r;
         return true;
     }
     else if (args.classname == "KexiDBImageBox") {
         KexiDBImageBox *image = static_cast<KexiDBImageBox*>(args.widget);
         image->insertFromFile();
         args.execute = false;
         return true;
     }
     return false;
 }
 
 bool
-KexiDBFactory::previewWidget(const QByteArray &, QWidget *, KFormDesigner::Container *)
+KexiMainFormWidgetsFactory::previewWidget(const QByteArray &, QWidget *, KFormDesigner::Container *)
 {
     return false;
 }
 
 bool
-KexiDBFactory::clearWidgetContent(const QByteArray & /*classname*/, QWidget *w)
+KexiMainFormWidgetsFactory::clearWidgetContent(const QByteArray & /*classname*/, QWidget *w)
 {
-//! @todo this code should not be copied here but
-//! just inherited KexiStandardFormWidgetsFactory::clearWidgetContent() should be called
     KexiFormDataItemInterface *iface = dynamic_cast<KexiFormDataItemInterface*>(w);
-    if (iface)
+    if (iface) {
         iface->clear();
+    }
     return true;
 }
 
 bool
-KexiDBFactory::isPropertyVisibleInternal(const QByteArray& classname, QWidget *w,
+KexiMainFormWidgetsFactory::isPropertyVisibleInternal(const QByteArray& classname, QWidget *w,
         const QByteArray& property, bool isTopLevel)
 {
     //general
     bool ok = true;
     if (classname == "KexiDBPushButton" || classname == "KexiPushButton") {
         ok = property != "isDragEnabled"
 #ifndef KEXI_SHOW_UNFINISHED
              && property != "onClickAction" /*! @todo reenable */
              && property != "onClickActionOption" /*! @todo reenable */
              && property != "iconSet" /*! @todo reenable */
              && property != "iconSize" /*! @todo reenable */
              && property != "stdItem" /*! @todo reenable stdItem */
 #endif
              ;
+        ok = KFormDesigner::WidgetFactory::advancedPropertiesVisible()
+             || (ok && property != "autoDefault" && property != "default");
      } else if (classname == "KexiDBCommandLinkButton") {
         ok = property != "isDragEnabled"
              && property != "default"
              && property != "checkable"
              && property != "autoDefault"
              && property != "autoRepeat"
              && property != "autoRepeatDelay"
              && property != "autoRepeatInterval"
 #ifndef KEXI_SHOW_UNFINISHED
              && property != "onClickAction" /*! @todo reenable */
              && property != "onClickActionOption" /*! @todo reenable */
              && property != "iconSet" /*! @todo reenable */
              && property != "iconSize" /*! @todo reenable */
              && property != "stdItem" /*! @todo reenable stdItem */
 #endif
              ;
      } else if (classname == "KexiDBSlider") {
         ok = property != "sliderPosition"
              && property != "tracking";
      } else if (classname == "KexiDBProgressBar") {
         ok = property != "focusPolicy"
              && property != "value";
-     } else if (classname == "KexiDBLineEdit")
+     } else if (classname == "KexiDBLineEdit" || classname == "QLineEdit")
         ok = property != "urlDropsEnabled"
              && property != "vAlign"
              && property != "echoMode"
              && property != "clickMessage" // Replaced by placeholderText in 2.9,
                                            // kept for backward compatibility Kexi projects created with Qt < 4.7.
              && property != "showClearButton" // Replaced by clearButtonEnabled in 3.0,
                                               // kept for backward compatibility Kexi projects created with Qt 4.
 #ifndef KEXI_SHOW_UNFINISHED
              && property != "inputMask"
              && property != "maxLength" //!< we may want to integrate this with db schema
 #endif
              ;
     else if (classname == "KexiDBComboBox")
         ok = property != "autoCaption"
              && property != "labelPosition"
              && property != "widgetType"
              && property != "fieldTypeInternal"
              && property != "fieldCaptionInternal" //hide properties that come with KexiDBAutoField
 #ifndef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
              && property != "foregroundLabelColor"
              && property != "backgroundLabelColor"
 #endif
              ;
-    else if (classname == "KexiDBTextEdit")
-        ok = property != "undoDepth"
-             && property != "undoRedoEnabled" //always true!
-             && property != "dragAutoScroll" //always true!
-             && property != "overwriteMode" //always false!
-             && property != "resizePolicy"
-             && property != "autoFormatting" //too complex
-             && property != "documentTitle"
-             && property != "cursorWidth"
+    else if (classname == "KexiDBTextEdit" || classname == "KTextEdit")
+        ok = KFormDesigner::WidgetFactory::advancedPropertiesVisible()
+             || (property != "undoDepth"
+                 && property != "undoRedoEnabled" //always true!
+                 && property != "dragAutoScroll" //always true!
+                 && property != "overwriteMode" //always false!
+                 && property != "resizePolicy"
+                 && property != "autoFormatting" //too complex
+                 && property != "documentTitle"
+                 && property != "cursorWidth"
 #ifndef KEXI_SHOW_UNFINISHED
-             && property != "paper"
+                 && property != "paper"
 #endif
-             && property != "textInteractionFlags"
+                 && property != "textInteractionFlags"
 //! @todo support textInteractionFlags property of QLabel and QTextEdit
-             ;
+             );
     else if (classname == "KexiDBForm")
         ok = property != "iconText"
              && property != "geometry" /*nonsense for toplevel widget; for size, "size" property is used*/;
-    else if (classname == "KexiDBLabel")
+    else if (classname == "KexiDBLabel" || classname == "QLabel")
         ok = property != "focusPolicy"
-             && property != "textInteractionFlags";
+             && property != "textInteractionFlags"
+             && property != "pixmap";
 //! @todo support textInteractionFlags property of QLabel
+    else if (classname == "KexiLineWidget" || classname == "Line") {
+        ok = property != "frameShape" && property != "font" && property != "margin";
+    }
+#ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
     else if (classname == "KexiDBAutoField") {
         if (!isTopLevel && property == "caption")
             return true; //force
         if (property == "fieldTypeInternal" || property == "fieldCaptionInternal"
 //! @todo unhide in 2.0
                 || property == "widgetType")
             return false;
         ok = property != "text"; /* "text" is not needed as "caption" is used instead */
     }
-    else if (classname == "KexiDBImageBox") {
-        ok = property != "font" && property != "wordbreak" && property != "pixmapId";
+#endif
+    else if (classname == "KexiDBImageBox" || classname == "KexiPictureLabel") {
+        ok = property != "font" && property != "wordbreak" && property != "pixmapId"
+             && property != "text" && property != "indent" && property != "textFormat"
+             && property == "alignment";
     }
-    else if (classname == "KexiDBCheckBox") {
+    else if (classname == "KexiDBCheckBox" || classname == "QCheckBox") {
         //hide text property if the widget is a child of an autofield beause there's already "caption" for this purpose
         if (property == "text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->parentWidget()))
             return false;
-        ok = property != "autoRepeat";
+        ok = KFormDesigner::WidgetFactory::advancedPropertiesVisible() || property != "autoRepeat";
+    }
+#ifdef KEXI_SHOW_UNFINISHED
+    else if (classname == "QRadioButton") {
+        ok = KFormDesigner::WidgetFactory::advancedPropertiesVisible() || (property != "autoRepeat");
     }
+#endif
     else if (classname == "KexiDBDatePicker") {
         ok = property != "closeButton"
              && property != "fontSize";
+    } else if (classname == "QGroupBox") {
+        ok =
+#ifndef KEXI_SHOW_UNFINISHED
+            /*! @todo Hidden for now in Kexi. "checkable" and "checked" props need adding
+            a fake properties which will allow to properly work in design mode, otherwise
+            child widgets become frozen when checked==true */
+            (KFormDesigner::WidgetFactory::advancedPropertiesVisible() || (property != "checkable" && property != "checked")) &&
+#endif
+            true;
+    } else if (classname == "KFDTabWidget") {
+        ok = (KFormDesigner::WidgetFactory::advancedPropertiesVisible()
+             || (property != "tabReorderingEnabled"
+                 && property != "hoverCloseButton"
+                 && property != "hoverCloseButtonDelayed"));
     }
-
-
     return ok && KexiDBFactoryBase::isPropertyVisibleInternal(classname, w, property, isTopLevel);
 }
 
 bool
-KexiDBFactory::propertySetShouldBeReloadedAfterPropertyChange(const QByteArray& classname,
+KexiMainFormWidgetsFactory::propertySetShouldBeReloadedAfterPropertyChange(const QByteArray& classname,
         QWidget *w, const QByteArray& property)
 {
     Q_UNUSED(classname);
     Q_UNUSED(w);
     return property == "fieldTypeInternal" || property == "widgetType"
            || property == "paletteBackgroundColor" || property == "autoFillBackground";
 }
 
-bool KexiDBFactory::changeInlineText(KFormDesigner::Form *form, QWidget *widget,
+bool KexiMainFormWidgetsFactory::changeInlineText(KFormDesigner::Form *form, QWidget *widget,
     const QString &text, QString &oldText)
 {
     const QByteArray n(widget->metaObject()->className());
-    if (n == "KexiDBAutoField") {
+    if (false) {
+    }
+#ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
+    else if (n == "KexiDBAutoField") {
         oldText = widget->property("caption").toString();
         changeProperty(form, widget, "caption", text);
         return true;
-    } else if (n == "KexiDBCommandLinkButton") {
+    }
+#endif
+#ifdef KEXI_SHOW_UNFINISHED
+    else if (n == "KIntSpinBox") {
+        oldText = QString::number(qobject_cast<QSpinBox*>(widget)->value());
+        qobject_cast<QSpinBox*>(widget)->setValue(text.toInt());
+    }
+#endif
+    else {
         oldText = widget->property("text").toString();
         changeProperty(form, widget, "text", text);
         return true;
     }
-
 //! @todo check field's geometry
     return false;
 }
 
 void
-KexiDBFactory::resizeEditor(QWidget *editor, QWidget *w, const QByteArray &classname)
+KexiMainFormWidgetsFactory::resizeEditor(QWidget *editor, QWidget *w, const QByteArray &classname)
 {
-    if (classname == "KexiDBAutoField")
+    QSize s = w->size();
+    QPoint p = w->pos();
+    QRect r;
+
+    if (classname == "KexiDBCheckBox") {
+        QStyleOptionButton option;
+        option.initFrom(w);
+        r = w->style()->subElementRect(QStyle::SE_CheckBoxContents, &option, w);
+        p += r.topLeft();
+        s.setWidth(r.width());
+    } else if (classname == "KexiDBPushButton") {
+        QStyleOptionButton option;
+        option.initFrom(w);
+        r = w->style()->subElementRect(QStyle::SE_PushButtonContents, &option, w);
+        p += r.topLeft();
+        s = r.size();
+    }
+#ifdef KEXI_SHOW_UNFINISHED
+    else if (classname == "QRadioButton") {
+        QStyleOptionButton option;
+        option.initFrom(w);
+        r = w->style()->subElementRect(
+                QStyle::SE_RadioButtonContents, &option, w);
+        p += r.topLeft();
+        s.setWidth(r.width());
+#endif
+
+    editor->resize(s);
+    editor->move(p);
+
+    //! @todo KEXI3
+    /* from ContainerFactory::resizeEditor(QWidget *editor, QWidget *widget, const QByteArray &):
+        QSize s = w->size();
+        editor->move(w->x() + 2, w->y() - 5);
+        editor->resize(s.width() - 20, w->fontMetrics().height() + 10); */
+    
+#ifdef KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT
+    if (classname == "KexiDBAutoField") {
         editor->setGeometry(static_cast<KexiDBAutoField*>(w)->label()->geometry());
+    }
+#endif
 }
 
-void
-KexiDBFactory::slotImageBoxIdChanged(KexiBLOBBuffer::Id_t id)
+bool KexiMainFormWidgetsFactory::saveSpecialProperty(const QByteArray &classname,
+    const QString &name, const QVariant &, QWidget *w, QDomElement &parentNode,
+    QDomDocument &domDoc)
+{
+    Q_UNUSED(classname)
+    if (false) {
+    }
+/* TODO
+    else if (name == "list_items" && classname == "KexiDBComboBox") {
+        KexiDBComboBox *combo = qobject_cast<KexiDBComboBox*>(w);
+        for (int i = 0; i < combo->row; i++) {
+            QDomElement item = domDoc.createElement("item");
+            KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", combo->itemText(i));
+            parentNode.appendChild(item);
+        }
+        return true;
+    }
+*/
+#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
+    else if (name == "list_contents" && classname == "QTreeWidget") {
+        QTreeWidget *treewidget = qobject_cast<QTreeWidget*>(w);
+        // First we save the columns
+        QTreeWidgetItem *headerItem = treewidget->headerItem();
+        if (headerItem) {
+            for (int i = 0; i < treewidget->columnCount(); i++) {
+                QDomElement item = domDoc.createElement("column");
+                KFormDesigner::FormIO::savePropertyElement(
+                    item, domDoc, "property", "text", headerItem->text(i));
+                KFormDesigner::FormIO::savePropertyElement(
+                    item, domDoc, "property", "width", treewidget->columnWidth(i));
+                KFormDesigner::FormIO::savePropertyElement(
+                    item, domDoc, "property", "resizable", treewidget->header()->isResizeEnabled(i));
+                KFormDesigner::FormIO::savePropertyElement(
+                    item, domDoc, "property", "clickable", treewidget->header()->isClickEnabled(i));
+                KFormDesigner::FormIO::savePropertyElement(
+                    item, domDoc, "property", "fullwidth", treewidget->header()->isStretchEnabled(i));
+                parentNode.appendChild(item);
+            }
+        }
+        // Then we save the list view items
+        QTreeWidgetItem *item = listwidget->firstChild();
+        while (item) {
+            saveListItem(item, parentNode, domDoc);
+            item = item->nextSibling();
+        }
+        return true;
+    }
+#endif
+    else if (name == "title" && w->parentWidget()->parentWidget()->inherits("QTabWidget")) {
+        TabWidgetBase *tab = qobject_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
+        KFormDesigner::FormIO::savePropertyElement(
+            parentNode, domDoc, "attribute", "title", tab->tabText(tab->indexOf(w)));
+    }
+    return true;
+}
+
+#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
+void KexiMainFormWidgetsFactory::saveListItem(QListWidgetItem *item,
+                                              QDomNode &parentNode, QDomDocument &domDoc)
+{
+    QDomElement element = domDoc.createElement("item");
+    parentNode.appendChild(element);
+
+    // We save the text of each column
+    for (int i = 0; i < item->listWidget()->columns(); i++) {
+        KFormDesigner::FormIO::savePropertyElement(
+            element, domDoc, "property", "text", item->text(i));
+    }
+
+    // Then we save every sub items
+    QListWidgetItem *child = item->firstChild();
+    while (child) {
+        saveListItem(child, element, domDoc);
+        child = child->nextSibling();
+    }
+}
+
+void KexiMainFormWidgetsFactory::readTreeItem(
+    QDomElement &node, QTreeWidgetItem *parent, QTreeWidget *treewidget)
+{
+    QTreeWidgetItem *item;
+    if (parent)
+        item = new QTreeWidgetItem(parent);
+    else
+        item = new QTreeWidgetItem(treewidget);
+
+    // We need to move the item at the end of the list
+    QTreeWidgetItem *last;
+    if (parent)
+        last = parent->firstChild();
+    else
+        last = treewidget->firstChild();
+
+    while (last->nextSibling())
+        last = last->nextSibling();
+    item->moveItem(last);
+
+    int i = 0;
+    for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
+        QDomElement childEl = n.toElement();
+        QString prop = childEl.attribute("name");
+        QString tag = childEl.tagName();
+
+        // We read sub items
+        if (tag == "item") {
+            item->setOpen(true);
+            readListItem(childEl, item, treewidget);
+        }
+        // and column texts
+        else if (tag == "property" && prop == "text") {
+            QVariant val = KFormDesigner::FormIO::readPropertyValue(
+                n.firstChild(), treewidget, "item");
+            item->setText(i, val.toString());
+            i++;
+        }
+    }
+}
+
+void KexiMainFormWidgetsFactory::editListContents()
+{
+    if (widget()->inherits("QTreeWidget"))
+        editTreeWidget(qobject_cast<QTreeWidget*>(widget()));
+}
+#endif
+
+bool KexiMainFormWidgetsFactory::readSpecialProperty(const QByteArray &classname,
+                                                     QDomElement &node, QWidget *w,
+                                                     KFormDesigner::ObjectTreeItem *item)
+{
+    Q_UNUSED(classname)
+    const QString tag(node.tagName());
+    const QString name(node.attribute("name"));
+//    KFormDesigner::Form *form = item->container()
+//            ? item->container()->form() : item->parent()->container()->form();
+
+    if (false) {
+    }
+/* TODO
+    else if (tag == "item" && classname == "KComboBox") {
+        KComboBox *combo = qobject_cast<KComboBox*>(w);
+        QVariant val = KFormDesigner::FormIO::readPropertyValue(
+                    form, node.firstChild().firstChild(), w, name);
+        if (val.canConvert(QVariant::Pixmap))
+            combo->addItem(val.value<QPixmap>(), QString());
+        else
+            combo->addItem(val.toString());
+        return true;
+    }*/
+#ifdef KEXI_LIST_FORM_WIDGET_SUPPORT
+    else if (tag == "column" && classname == "QTreeWidget") {
+        QTreeWidget *tw = qobject_cast<QTreeWidget*>(w);
+        int id = 0;
+        for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {
+            QString prop = n.toElement().attribute("name");
+            QVariant val = KFormDesigner::FormIO::readPropertyValue(n.firstChild(), w, name);
+            if (prop == "text")
+                id = tw->addColumn(val.toString());
+            else if (prop == "width")
+                tw->setColumnWidth(id, val.toInt());
+            else if (prop == "resizable")
+                tw->header()->setResizeEnabled(val.toBool(), id);
+            else if (prop == "clickable")
+                tw->header()->setClickEnabled(val.toBool(), id);
+            else if (prop == "fullwidth")
+                tw->header()->setStretchEnabled(val.toBool(), id);
+        }
+        return true;
+    }
+    else if (tag == "item" && classname == "QTreeWidget") {
+        QTreeWidget *tw = qobject_cast<QTreeWidget*>(w);
+        readListItem(node, 0, tw);
+        return true;
+    }
+#endif
+    else if (name == "title" && item->parent()->widget()->inherits("QTabWidget")) {
+        TabWidgetBase *tab = qobject_cast<TabWidgetBase*>(w->parentWidget());
+        tab->addTab(w, node.firstChild().toElement().text());
+        item->addModifiedProperty("title", node.firstChild().toElement().text());
+        return true;
+    }
+    return false;
+}
+
+void KexiMainFormWidgetsFactory::setPropertyOptions(KPropertySet& set,
+                                                    const KFormDesigner::WidgetInfo& info,
+                                                    QWidget *w)
+{
+    Q_UNUSED(info);
+    Q_UNUSED(w);
+    if (set.contains("indent")) {
+        set["indent"].setOption("min", -1);
+        set["indent"].setOption("minValueText", xi18nc("default indent value", "default"));
+    }
+}
+
+void KexiMainFormWidgetsFactory::reorderTabs(int oldpos, int newpos)
+{
+    KFDTabWidget *tabWidget = qobject_cast<KFDTabWidget*>(sender());
+    KFormDesigner::ObjectTreeItem *tab
+            = tabWidget->container()->form()->objectTree()->lookup(tabWidget->objectName());
+    if (!tab)
+        return;
+
+    tab->children()->move(oldpos, newpos);
+}
+
+KFormDesigner::ObjectTreeItem* KexiMainFormWidgetsFactory::selectableItem(
+                                                KFormDesigner::ObjectTreeItem* item)
+{
+    if (item->parent() && item->parent()->widget()) {
+        if (qobject_cast<QTabWidget*>(item->parent()->widget())) {
+            // tab widget's page
+            return item->parent();
+        }
+    }
+    return item;
+}
+
+void KexiMainFormWidgetsFactory::slotImageBoxIdChanged(KexiBLOBBuffer::Id_t id)
 {
     KexiFormView *formView = KDbUtils::findParent<KexiFormView*>((QWidget*)sender());
     if (formView) {
         changeProperty(formView->form(), formView, "pixmapId", int(/*! @todo unsafe */id));
         formView->setUnsavedLocalBLOB(formView->form()->selectedWidget(), id);
     }
 }
 
-#include "kexidbfactory.moc"
+#include "KexiMainFormWidgetsFactory.moc"
diff --git a/src/plugins/forms/kexidbfactory.h b/src/plugins/forms/widgets/main/KexiMainFormWidgetsFactory.h
similarity index 65%
rename from src/plugins/forms/kexidbfactory.h
rename to src/plugins/forms/widgets/main/KexiMainFormWidgetsFactory.h
index 05c3d620c..2f7a45c66 100644
--- a/src/plugins/forms/kexidbfactory.h
+++ b/src/plugins/forms/widgets/main/KexiMainFormWidgetsFactory.h
@@ -1,68 +1,90 @@
 /* This file is part of the KDE project
    Copyright (C) 2004 Cedric Pasteur <cedric.pasteur@free.fr>
-   Copyright (C) 2004-2006 Jarosław Staniek <staniek@kde.org>
+   Copyright (C) 2004-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 KEXIDBFACTORY_H
-#define KEXIDBFACTORY_H
+#ifndef KEXIMAINFORMWIDGETSFACTORY_H
+#define KEXIMAINFORMWIDGETSFACTORY_H
 
 #include "kexidbfactorybase.h"
 
 class QAction;
 
 //! Kexi Factory for data-aware widgets
 //! @todo merge with KexiStandardFormWidgetsFactory
-class KexiDBFactory : public KexiDBFactoryBase
+class KexiMainFormWidgetsFactory : public KexiDBFactoryBase
 {
     Q_OBJECT
 
 public:
-    KexiDBFactory(QObject *parent, const QVariantList &);
-    virtual ~KexiDBFactory();
+    KexiMainFormWidgetsFactory(QObject *parent, const QVariantList &);
+    virtual ~KexiMainFormWidgetsFactory();
 
     virtual QWidget *createWidget(const QByteArray &classname, QWidget *parent, const char *name,
                                   KFormDesigner::Container *container,
                                   CreateWidgetOptions options = DefaultOptions);
 
     virtual void createCustomActions(KActionCollection* col);
     virtual bool createMenuActions(const QByteArray &classname, QWidget *w, QMenu *menu,
                                    KFormDesigner::Container *container);
     virtual bool startInlineEditing(InlineEditorCreationArguments& args);
     virtual bool previewWidget(const QByteArray &, QWidget *, KFormDesigner::Container *);
     virtual bool clearWidgetContent(const QByteArray &classname, QWidget *w);
 
+    //! Moved into public for EditRichTextAction
+    bool editRichText(QWidget *w, QString &text) const
+    {
+        return KexiDBFactoryBase::editRichText(w, text);
+    }
+
+    //! Moved into public for EditRichTextAction
+    void changeProperty(KFormDesigner::Form *form, QWidget *widget, const char *name,
+        const QVariant &value)
+    {
+        KexiDBFactoryBase::changeProperty(form, widget, name, value);
+    }
+
+    bool readSpecialProperty(const QByteArray &classname, QDomElement &node,
+                             QWidget *w, KFormDesigner::ObjectTreeItem *item)  override;
+    bool saveSpecialProperty(const QByteArray &classname, const QString &name,
+                             const QVariant &value, QWidget *w,
+                             QDomElement &parentNode, QDomDocument &parent) override;
+    void setPropertyOptions(KPropertySet& set, const KFormDesigner::WidgetInfo& info, QWidget *w) override;
+
 protected Q_SLOTS:
     void slotImageBoxIdChanged(long id); /*KexiBLOBBuffer::Id_t*/
+    void reorderTabs(int oldpos, int newpos);
 
 protected:
+    KFormDesigner::ObjectTreeItem* selectableItem(KFormDesigner::ObjectTreeItem* item);
     virtual bool changeInlineText(KFormDesigner::Form *form, QWidget *widget,
         const QString &text, QString &oldText);
     virtual void resizeEditor(QWidget *editor, QWidget *widget, const QByteArray &classname);
 
     virtual bool isPropertyVisibleInternal(const QByteArray& classname, QWidget *w,
                                            const QByteArray& property, bool isTopLevel);
 
     //! Sometimes property sets should be reloaded when a given property value changed.
     //! @todo this does not seem to work in Kexi 2.x
     virtual bool propertySetShouldBeReloadedAfterPropertyChange(const QByteArray& classname, QWidget *w,
             const QByteArray& property);
 
     QAction * m_assignAction;
 };
 
 #endif
diff --git a/src/formeditor/factories/KexiStandardContainerFormWidgets.cpp b/src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.cpp
similarity index 100%
rename from src/formeditor/factories/KexiStandardContainerFormWidgets.cpp
rename to src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.cpp
diff --git a/src/formeditor/factories/KexiStandardContainerFormWidgets.h b/src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.h
similarity index 100%
rename from src/formeditor/factories/KexiStandardContainerFormWidgets.h
rename to src/plugins/forms/widgets/main/KexiStandardContainerFormWidgets.h
diff --git a/src/formeditor/factories/KexiStandardFormWidgets.cpp b/src/plugins/forms/widgets/main/KexiStandardFormWidgets.cpp
similarity index 75%
rename from src/formeditor/factories/KexiStandardFormWidgets.cpp
rename to src/plugins/forms/widgets/main/KexiStandardFormWidgets.cpp
index 9389feb8f..5545abf8d 100644
--- a/src/formeditor/factories/KexiStandardFormWidgets.cpp
+++ b/src/plugins/forms/widgets/main/KexiStandardFormWidgets.cpp
@@ -1,126 +1,102 @@
 /* This file is part of the KDE project
    Copyright (C) 2003 by Lucijan Busch <lucijan@kde.org>
    Copyright (C) 2004 Cedric Pasteur <cedric.pasteur@free.fr>
    Copyright (C) 2009-2014 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 "KexiStandardFormWidgets.h"
-#include "KexiStandardFormWidgetsFactory.h"
+#include "KexiMainFormWidgetsFactory.h"
 #include <KexiIcon.h>
 
 #include <KTextEdit>
 #include <KLocalizedString>
 
 #include <QStackedWidget>
 
-// Some widgets subclass to allow event filtering and some other things
-KexiPictureLabel::KexiPictureLabel(const QPixmap &pix, QWidget *parent)
-        : QLabel(parent)
-{
-    setPixmap(pix);
-    setScaledContents(false);
-}
-
-KexiPictureLabel::~KexiPictureLabel()
-{
-}
-
-bool
-KexiPictureLabel::setProperty(const char *name, const QVariant &value)
-{
-    if (0 == qstrcmp(name, "pixmap")) {
-        const QPixmap pm(value.value<QPixmap>());
-        resize(pm.height(), pm.width());
-    }
-    return QLabel::setProperty(name, value);
-}
-
-Line::Line(Qt::Orientation orient, QWidget *parent)
+KexiLineWidget::KexiLineWidget(Qt::Orientation o, QWidget *parent)
         : QFrame(parent)
 {
     setFrameShadow(Sunken);
-    if (orient == Qt::Horizontal)
+    if (o == Qt::Horizontal)
         setFrameShape(HLine);
     else
         setFrameShape(VLine);
 }
 
-Line::~Line()
+KexiLineWidget::~KexiLineWidget()
 {
 }
 
-void
-Line::setOrientation(Qt::Orientation orient)
+void KexiLineWidget::setOrientation(Qt::Orientation o)
 {
-    if (orient == Qt::Horizontal)
+    if (o == Qt::Horizontal)
         setFrameShape(HLine);
     else
         setFrameShape(VLine);
 }
 
-Qt::Orientation
-Line::orientation() const
+Qt::Orientation KexiLineWidget::orientation() const
 {
     if (frameShape() == HLine)
         return Qt::Horizontal;
     else
         return Qt::Vertical;
 }
 
 // ---
 
 EditRichTextAction::EditRichTextAction(KFormDesigner::Container *container,
                                        QWidget *receiver, QObject *parent,
-                                       KexiStandardFormWidgetsFactory *factory)
+                                       KexiMainFormWidgetsFactory *factory)
     : QAction(koIcon("document-edit"),
               xi18nc("Edit rich text for a widget", "Edit Rich Text"),
               parent)
     , m_container(container)
     , m_receiver(receiver)
     , m_factory(factory)
 {
     connect(this, SIGNAL(triggered()), this, SLOT(slotTriggered()));
 }
 
 void EditRichTextAction::slotTriggered()
 {
     const QByteArray classname( m_receiver->metaObject()->className() );
     QString text;
     if (classname == "KTextEdit") {
         KTextEdit* te = qobject_cast<KTextEdit*>(m_receiver);
         if (te->acceptRichText()) {
             text = te->toHtml();
         }
         else {
             text = te->toPlainText();
         }
     }
     else if (classname == "QLabel") {
         text = qobject_cast<QLabel*>(m_receiver)->text();
     }
 
     if (m_factory->editRichText(m_receiver, text)) {
 //! @todo ok?
         m_factory->changeProperty(m_container->form(), m_receiver, "acceptRichText", true);
         m_factory->changeProperty(m_container->form(), m_receiver, "text", text);
     }
 
     if (classname == "QLabel") {
         m_receiver->resize(m_receiver->sizeHint());
     }
 }
diff --git a/src/formeditor/factories/KexiStandardFormWidgets.h b/src/plugins/forms/widgets/main/KexiStandardFormWidgets.h
similarity index 73%
rename from src/formeditor/factories/KexiStandardFormWidgets.h
rename to src/plugins/forms/widgets/main/KexiStandardFormWidgets.h
index f6f1d3d88..65e8b2812 100644
--- a/src/formeditor/factories/KexiStandardFormWidgets.h
+++ b/src/plugins/forms/widgets/main/KexiStandardFormWidgets.h
@@ -1,82 +1,70 @@
 /* This file is part of the KDE project
    Copyright (C) 2003 by Lucijan Busch <lucijan@kde.org>
    Copyright (C) 2004 Cedric Pasteur <cedric.pasteur@free.fr>
    Copyright (C) 2009 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 KEXISTANDARDFORMWIDGETS_H
 #define KEXISTANDARDFORMWIDGETS_H
 
 #include <QFrame>
 #include <QPixmap>
 #include <QLabel>
 #include <QMenu>
 
 #include "widgetfactory.h"
 #include "container.h"
 #include "FormWidgetInterface.h"
 
 class QTreeWidgetItem;
 class QTreeWidget;
 class KPropertySet;
-class KexiStandardFormWidgetsFactory;
-
-//! A picture label widget for use within forms
-class KexiPictureLabel : public QLabel, public KFormDesigner::FormWidgetInterface
-{
-    Q_OBJECT
-
-public:
-    explicit KexiPictureLabel(const QPixmap &pix, QWidget *parent = 0);
-    virtual ~KexiPictureLabel();
-
-    virtual bool setProperty(const char *name, const QVariant &value);
-};
+class KexiMainFormWidgetsFactory;
 
 //! A line widget for use within forms
-class Line : public QFrame, public KFormDesigner::FormWidgetInterface
+class KexiLineWidget : public QFrame, public KFormDesigner::FormWidgetInterface
 {
     Q_OBJECT
     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
 
 public:
-    explicit Line(Qt::Orientation orient, QWidget *parent = 0);
-    virtual ~Line();
+    explicit KexiLineWidget(Qt::Orientation o, QWidget *parent = nullptr);
+    virtual ~KexiLineWidget();
 
-    void setOrientation(Qt::Orientation orient);
+    void setOrientation(Qt::Orientation o);
     Qt::Orientation orientation() const;
 };
 
 //! Internal action of editing rich text for a label or text editor
 //! Keeps context expressed using container and receiver widget
 class EditRichTextAction : public QAction
 {
     Q_OBJECT
 public:
     EditRichTextAction(KFormDesigner::Container *container,
                        QWidget *receiver, QObject *parent,
-                       KexiStandardFormWidgetsFactory *factory);
+                       KexiMainFormWidgetsFactory *factory);
 protected Q_SLOTS:
     void slotTriggered();
 private:
     KFormDesigner::Container *m_container;
     QWidget *m_receiver;
-    KexiStandardFormWidgetsFactory *m_factory;
+    KexiMainFormWidgetsFactory *m_factory;
 };
 
 #endif
diff --git a/src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json b/src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json
new file mode 100644
index 000000000..612de992f
--- /dev/null
+++ b/src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json
@@ -0,0 +1,24 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "kexi@kde.org",
+                "Name": "Kexi Team"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [],
+        "Description": "Kexi plugin providing database form widgets",
+        "EnabledByDefault": true,
+        "Icon": "form",
+        "Id": "org.kexi-project.form.widgets.main",
+        "License": "LGPL",
+        "Name": "Main form widgets",
+        "ServiceTypes": [
+            "Kexi/FormWidget"
+        ],
+        "Version": "3.1",
+        "Website": "http://kexi-project.org"
+    },
+    "X-Kexi-FormWidgetsFactoryGroup": ""
+}
diff --git a/src/plugins/forms/widgets/main/pics/CMakeLists.txt b/src/plugins/forms/widgets/main/pics/CMakeLists.txt
new file mode 100644
index 000000000..822a03654
--- /dev/null
+++ b/src/plugins/forms/widgets/main/pics/CMakeLists.txt
@@ -0,0 +1 @@
+kexi_add_plugin_icons_rcc_file(org.kexi-project.form.widgets.main breeze)
diff --git a/src/plugins/forms/widgets/main/pics/icons/breeze/files.cmake b/src/plugins/forms/widgets/main/pics/icons/breeze/files.cmake
new file mode 100644
index 000000000..3dc22c42d
--- /dev/null
+++ b/src/plugins/forms/widgets/main/pics/icons/breeze/files.cmake
@@ -0,0 +1,11 @@
+# List of project's own icon files
+# This file is generated by update_icon_list.sh
+# WARNING! All changes made in this file will be lost!
+
+set(_PNG_FILES
+)
+
+set(_SVG_FILES
+)
+
+set(_FILES ${_PNG_FILES} ${_SVG_FILES})
diff --git a/src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop b/src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop
index ff62a57a9..32dd38a90 100644
--- a/src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop
+++ b/src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop
@@ -1,52 +1,52 @@
 [Desktop Entry]
 Name=Map Widget
 Name[ca]=Estris de mapes
 Name[ca@valencia]=Estris de mapes
 Name[de]=Karten-Bedienelement
 Name[en_GB]=Map Widget
 Name[es]=Elemento gráfico de mapas
 Name[fi]=Karttaelementti
 Name[gl]=Trebello de mapa
 Name[it]=Oggetto mappa
 Name[nl]=Kaartwidget
 Name[pl]=Element interfejsu mapy
 Name[pt]=Elemento de Mapa
 Name[pt_BR]=Elemento de mapa
 Name[sk]=Widget Mapa
 Name[sv]=Kartkomponenter
 Name[uk]=Віджет карти
 Name[x-test]=xxMap Widgetxx
 Comment=Kexi plugin providing map browser form widget
 Comment[ca]=Connector del Kexi que proporciona estris de formularis de navegació de mapes
 Comment[ca@valencia]=Connector del Kexi que proporciona estris de formularis de navegació de mapes
 Comment[de]=Kexi-Modul, das ein Karten-Bedienelement bereitstellt
 Comment[en_GB]=Kexi plugin providing map browser form widget
 Comment[es]=Complemento de Kexi que proporciona un elemento gráfico de exploración de mapas para los formularios
 Comment[fi]=Kexi-liitännäinen, joka tarjoaa karttaselaimen lomake-elementin
 Comment[gl]=Complemento para Kexi que fornece un trebello de navegador de mapa para formularios.
 Comment[it]=Estensione che fornisce un oggetto del modulo di navigazione mappe di Kexi
 Comment[nl]=Kexi-plug-in levert formulierwidget voor kaartenbrowser
 Comment[pl]=Wtyczka Kexi dostarczająca formularze przeglądania map
 Comment[pt]='Plugin' do Kexi que oferece um elemento gráfico de formulários de navegação em mapas
 Comment[pt_BR]=Plugin do Kexi que oferece um elemento gráfico de formulários de navegação em mapas
 Comment[sk]=Kexi plugin poskytujúci prehliadač máp z widgetu
 Comment[sv]=Kexi-insticksprogram som tillhandahåller formulärkomponent med kartbläddrare
 Comment[uk]=Додаток до Kexi, що забезпечує роботу форми навігатора картою
 Comment[x-test]=xxKexi plugin providing map browser form widgetxx
 Type=Service
 Icon=form
 Encoding=UTF-8
 
 X-KDE-Library=kexiforms_mapwidgetplugin
 X-KDE-ServiceTypes=Kexi/FormWidgets
 X-KDE-PluginInfo-Author=Kexi Team
 X-KDE-PluginInfo-Email=kexi@kde.org
 X-KDE-PluginInfo-Name=org.kexi-project.form.widgets.map
-X-KDE-PluginInfo-Version=3.0
+X-KDE-PluginInfo-Version=3.1
 X-KDE-PluginInfo-Website=http://kexi-project.org
 X-KDE-PluginInfo-Category=
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=LGPL
 X-KDE-PluginInfo-EnabledByDefault=true
 
 X-Kexi-FormWidgetsFactoryGroup=
diff --git a/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/16/kexi-form-map-browser.svg b/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/16/kexi-form-map-browser.svg
new file mode 100644
index 000000000..52449c5c6
--- /dev/null
+++ b/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/16/kexi-form-map-browser.svg
@@ -0,0 +1,96 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 16 16"
+   sodipodi:docname="16-actions-kreport_web_element.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.0621935"
+     inkscape:cy="8.0652012"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="960"
+     inkscape:window-x="-8"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4101" />
+    <sodipodi:guide
+       position="2,14.000017"
+       orientation="12,0"
+       id="guide4071" />
+    <sodipodi:guide
+       position="2,2.0000174"
+       orientation="0,12"
+       id="guide4073" />
+    <sodipodi:guide
+       position="14,2.0000174"
+       orientation="-12,0"
+       id="guide4075" />
+    <sodipodi:guide
+       position="14,14.000017"
+       orientation="0,-12"
+       id="guide4077" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(0,-1036.3622)">
+    <path
+       style="color:#000000;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 8.0625,2 C 6.4424905,1.977 4.833051,2.6094 3.6875,3.75 c -2.255737,2.2453 -2.255737,6.3172 0,8.5625 2.2562162,2.2448 6.337534,2.2448 8.59375,0 2.255737,-2.2453 2.255737,-6.3172 0,-8.5625 C 11.177757,2.6512 9.6230384,2.0232 8.0625,2 z M 7.90625,3.0625 c 1.1524631,-0.015 2.289579,0.4063 3.1875,1.125 L 10.3125,4.96875 C 9.2971691,4.06815 8.1243169,3.49525 7,3.21875 7.3031772,3.15675 7.5968963,3.0678 7.90625,3.0625 z M 5.6875,4 C 6.7849464,3.938 8.3089567,4.61535 9.5625,5.71875 L 7.96875,7.3125 4.90625,4.25 C 5.1382226,4.1351 5.3809685,4.0191 5.6875,4 z m 6.15625,0.9375 c 0.87257,1.0906 1.127412,2.52985 0.90625,3.90625 -0.305328,-1.0697 -0.855517,-2.1678 -1.71875,-3.125 z m -7.625,0.125 3,2.96875 -1.5625,1.5625 C 4.9329912,8.77645 4.4122006,7.8572 4.15625,7 3.9211358,6.2126 3.9970495,5.5756 4.21875,5.0625 z M 10.28125,6.5 C 10.994704,7.3121 11.558773,8.2127 11.8125,9.0625 12.04765,9.85 11.940588,10.4869 11.71875,11 L 8.75,8.03125 z M 3.1875,7.25 c 0.305123,1.0609 0.8649503,2.14305 1.71875,3.09375 L 4.125,11.125 C 3.25351,10.042 2.9767401,8.6213 3.1875,7.25 z M 8,8.75 l 2.96875,3 C 10.452532,11.9717 9.7926643,12.07805 9,11.84375 c -0.8610619,-0.2548 -1.7730422,-0.781 -2.59375,-1.5 z m -2.34375,2.34375 c 0.9615628,0.8529 2.0542663,1.41925 3.125,1.71875 -1.3699248,0.21 -2.8187182,-0.083 -3.90625,-0.9375 z"
+       id="rect3858"
+       transform="translate(0,1036.3622)"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccsccccccccccccccccccc" />
+    <rect
+       style="fill:#6c7a89;fill-opacity:1;stroke:none"
+       id="rect4035"
+       width="0"
+       height="10.999983"
+       x="-17"
+       y="1039.3622" />
+  </g>
+</svg>
diff --git a/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/22/kexi-form-map-browser.svg b/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/22/kexi-form-map-browser.svg
new file mode 100644
index 000000000..e19e6cd89
--- /dev/null
+++ b/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/22/kexi-form-map-browser.svg
@@ -0,0 +1,120 @@
+<?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="22"
+   height="22"
+   id="svg3760"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="map-globe.svg">
+  <defs
+     id="defs3762">
+    <linearGradient
+       id="linearGradient4324">
+      <stop
+         id="stop4326"
+         offset="0"
+         style="stop-color:#f62459;stop-opacity:1" />
+      <stop
+         id="stop4328"
+         offset="1"
+         style="stop-color:#f8567f;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="2.7980013"
+     inkscape:cy="5.7962131"
+     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="1021"
+     inkscape:window-x="-4"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4106"
+       originx="-0.99998557px"
+       originy="-1.0000252px" />
+    <sodipodi:guide
+       position="2.00001,19.99997"
+       orientation="0,18"
+       id="guide4229" />
+    <sodipodi:guide
+       position="20.00001,19.99997"
+       orientation="18,0"
+       id="guide4231" />
+    <sodipodi:guide
+       position="20.00001,1.99997"
+       orientation="0,-18"
+       id="guide4233" />
+    <sodipodi:guide
+       position="2.00001,1.99997"
+       orientation="-18,0"
+       id="guide4235" />
+    <sodipodi:guide
+       position="19.00001,2.99997"
+       orientation="0,-16"
+       id="guide4241" />
+    <sodipodi:guide
+       position="2.9999956,18.999992"
+       orientation="6,0"
+       id="guide4155" />
+    <sodipodi:guide
+       position="18.999996,12.999992"
+       orientation="-6,0"
+       id="guide4167" />
+    <sodipodi:guide
+       position="18.999996,18.999992"
+       orientation="0,-6"
+       id="guide4169" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3765">
+    <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(-551.28571,-607.64788)">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="M 11.117188 3 A 8.0000029 8.0000095 0 0 0 5.34375 5.34375 A 8.0000029 8.0000095 0 0 0 5.34375 16.65625 A 8.0000029 8.0000095 0 0 0 16.65625 16.65625 A 8.0000029 8.0000095 0 0 0 16.65625 5.34375 A 8.0000029 8.0000095 0 0 0 11.117188 3 z M 10.898438 4 A 7 7 0 0 1 15.578125 5.7148438 L 14.173828 7.1191406 A 8 5 45 0 0 8.75 4.3769531 A 7 7 0 0 1 10.898438 4 z M 7.8710938 5.3066406 A 7 4 45 0 1 13.464844 7.828125 L 11 10.292969 L 6.4492188 5.7421875 A 7 4 45 0 1 7.8710938 5.3066406 z M 16.291016 6.4160156 A 7 7 0 0 1 17.626953 13.226562 A 8 5 45 0 0 14.876953 7.8300781 L 16.291016 6.4160156 z M 5.7402344 6.4472656 L 10.292969 11 L 7.8261719 13.466797 A 7 4 45 0 1 5.7402344 6.4472656 z M 14.173828 8.5332031 A 7 4 45 0 1 16.259766 15.552734 L 11.707031 11 L 14.173828 8.5332031 z M 4.3730469 8.7734375 A 8 5 45 0 0 7.1230469 14.169922 L 5.7089844 15.583984 A 7 7 0 0 1 4.3730469 8.7734375 z M 11 11.707031 L 15.550781 16.257812 A 7 4 45 0 1 8.5351562 14.171875 L 11 11.707031 z M 7.8261719 14.880859 A 8 5 45 0 0 13.25 17.623047 A 7 7 0 0 1 6.421875 16.285156 L 7.8261719 14.880859 z "
+       transform="translate(551.28571,607.64788)"
+       id="path4521" />
+  </g>
+</svg>
diff --git a/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/24/kexi-form-map-browser.svg b/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/24/kexi-form-map-browser.svg
new file mode 100644
index 000000000..f40771bab
--- /dev/null
+++ b/src/plugins/forms/widgets/mapbrowser/pics/icons/breeze/actions/24/kexi-form-map-browser.svg
@@ -0,0 +1,120 @@
+<?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="24"
+   height="24"
+   id="svg3760"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="kreport-maps-element.svg">
+  <defs
+     id="defs3762">
+    <linearGradient
+       id="linearGradient4324">
+      <stop
+         id="stop4326"
+         offset="0"
+         style="stop-color:#f62459;stop-opacity:1" />
+      <stop
+         id="stop4328"
+         offset="1"
+         style="stop-color:#f8567f;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="1.78283"
+     inkscape:cy="9.3960818"
+     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="1280"
+     inkscape:window-height="942"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4106"
+       originx="-0.99998557px"
+       originy="-1.0000252px" />
+    <sodipodi:guide
+       position="2.00001,19.99997"
+       orientation="0,18"
+       id="guide4229" />
+    <sodipodi:guide
+       position="20.00001,19.99997"
+       orientation="18,0"
+       id="guide4231" />
+    <sodipodi:guide
+       position="20.00001,1.99997"
+       orientation="0,-18"
+       id="guide4233" />
+    <sodipodi:guide
+       position="2.00001,1.99997"
+       orientation="-18,0"
+       id="guide4235" />
+    <sodipodi:guide
+       position="19.00001,2.99997"
+       orientation="0,-16"
+       id="guide4241" />
+    <sodipodi:guide
+       position="2.9999956,18.999992"
+       orientation="6,0"
+       id="guide4155" />
+    <sodipodi:guide
+       position="18.999996,12.999992"
+       orientation="-6,0"
+       id="guide4167" />
+    <sodipodi:guide
+       position="18.999996,18.999992"
+       orientation="0,-6"
+       id="guide4169" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3765">
+    <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(-551.28571,-605.64788)">
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="m 563.4029,609.6489 a 8.0000029,8.0000095 0 0 0 -5.77344,2.34375 8.0000029,8.0000095 0 0 0 0,11.3125 8.0000029,8.0000095 0 0 0 11.3125,0 8.0000029,8.0000095 0 0 0 0,-11.3125 8.0000029,8.0000095 0 0 0 -5.53906,-2.34375 z m -0.21875,1 a 7,7 0 0 1 4.67968,1.71484 l -1.40429,1.4043 a 8,5 45 0 0 -5.42383,-2.74219 7,7 0 0 1 2.14844,-0.37695 z m -3.02735,1.30664 a 7,4 45 0 1 5.59375,2.52148 l -2.46484,2.46485 -4.55078,-4.55078 a 7,4 45 0 1 1.42187,-0.43555 z m 8.41993,1.10937 a 7,7 0 0 1 1.33593,6.81055 8,5 45 0 0 -2.75,-5.39648 l 1.41407,-1.41407 z m -10.55079,0.0312 4.55274,4.55274 -2.4668,2.4668 a 7,4 45 0 1 -2.08594,-7.01954 z m 8.4336,2.08594 a 7,4 45 0 1 2.08594,7.01953 l -4.55274,-4.55273 2.4668,-2.4668 z m -9.80078,0.24024 a 8,5 45 0 0 2.75,5.39648 l -1.41407,1.41406 a 7,7 0 0 1 -1.33593,-6.81054 z m 6.62695,2.93359 4.55078,4.55078 a 7,4 45 0 1 -7.01562,-2.08594 l 2.46484,-2.46484 z m -3.17383,3.17383 a 8,5 45 0 0 5.42383,2.74219 7,7 0 0 1 -6.82813,-1.3379 l 1.4043,-1.40429 z"
+       id="path4521"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/plugins/forms/widgets/webbrowser/16-actions-web_browser.png b/src/plugins/forms/widgets/webbrowser/16-actions-web_browser.png
deleted file mode 100644
index c774dfb63..000000000
Binary files a/src/plugins/forms/widgets/webbrowser/16-actions-web_browser.png and /dev/null differ
diff --git a/src/plugins/forms/widgets/webbrowser/22-actions-web_browser.png b/src/plugins/forms/widgets/webbrowser/22-actions-web_browser.png
deleted file mode 100644
index fe18955db..000000000
Binary files a/src/plugins/forms/widgets/webbrowser/22-actions-web_browser.png and /dev/null differ
diff --git a/src/plugins/forms/widgets/webbrowser/CMakeLists.txt b/src/plugins/forms/widgets/webbrowser/CMakeLists.txt
index a3d4b9695..c08ea6bcc 100644
--- a/src/plugins/forms/widgets/webbrowser/CMakeLists.txt
+++ b/src/plugins/forms/widgets/webbrowser/CMakeLists.txt
@@ -1,39 +1,36 @@
+# the web browser form widgets plugin
+
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/formeditor
     ${CMAKE_SOURCE_DIR}/src/core
 )
 
 set(kexiforms_webbrowserwidgetplugin_SRCS
     WebBrowserWidget.cpp
     WebBrowserFactory.cpp
+    kexiforms_webbrowserwidgetplugin.json
     Messages.sh
 )
 
-add_library(kexiforms_webbrowserwidgetplugin MODULE ${kexiforms_webbrowserwidgetplugin_SRCS})
-kcoreaddons_desktop_to_json(kexiforms_webbrowserwidgetplugin kexiforms_webbrowserwidgetplugin.desktop)
+add_library(org.kexi-project.form.widgets.web-browser MODULE ${kexiforms_webbrowserwidgetplugin_SRCS})
 
 set (QT_USE_QTWEBKIT TRUE)
 
-target_link_libraries(kexiforms_webbrowserwidgetplugin
+target_link_libraries(org.kexi-project.form.widgets.web-browser
     kformdesigner
     kexicore
     kexiguiutils
     kexidatatable
     kexiextendedwidgets
     kexidataviewcommon
     kexiformutils
 
     Qt5::Core
     Qt5::Gui
     Qt5::WebKitWidgets
     Qt5::Xml
 )
 
-install(TARGETS kexiforms_webbrowserwidgetplugin DESTINATION ${KEXI_FORM_WIDGETS_PLUGIN_INSTALL_DIR})
+install(TARGETS org.kexi-project.form.widgets.web-browser DESTINATION ${KEXI_FORM_WIDGETS_PLUGIN_INSTALL_DIR})
 
-ecm_install_icons(ICONS
-    16-actions-web_browser.png
-    22-actions-web_browser.png
-    DESTINATION ${DATA_INSTALL_DIR}/kexi/icons
-    THEME hicolor
-)
+add_subdirectory(pics)
diff --git a/src/plugins/forms/widgets/webbrowser/WebBrowserFactory.cpp b/src/plugins/forms/widgets/webbrowser/WebBrowserFactory.cpp
index b50bc5082..454a97d03 100644
--- a/src/plugins/forms/widgets/webbrowser/WebBrowserFactory.cpp
+++ b/src/plugins/forms/widgets/webbrowser/WebBrowserFactory.cpp
@@ -1,114 +1,114 @@
 /*
     <The basic code for the web widget in Kexi forms>
     Copyright (C) 2011  Shreya Pandit <shreya@shreyapandit.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 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
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 
 #include "WebBrowserFactory.h"
 #include <formeditor/WidgetInfo.h>
 #include <formeditor/formIO.h>
 #include "kexidataawarewidgetinfo.h"
 #include "WebBrowserWidget.h"
 #include <KexiIcon.h>
 #include <kexi.h>
 
 #include <KLocalizedString>
 
 #include <QVariant>
 #include <QVariantList>
 #include <QDebug>
 
 KEXI_PLUGIN_FACTORY(WebBrowserFactory, "kexiforms_webbrowserwidgetplugin.json")
 
 WebBrowserFactory::WebBrowserFactory(QObject* parent, const QVariantList& args)
   : KexiDBFactoryBase(parent)
 {
     Q_UNUSED(args);
     KexiDataAwareWidgetInfo* webBrowser = new KexiDataAwareWidgetInfo(this);
-    webBrowser->setIconName(koIconName("web_browser"));
+    webBrowser->setIconName(KexiIconName("kexiform-web-browser"));
     webBrowser->setClassName("WebBrowserWidget");
     webBrowser->setName(xi18n("Web Browser"));
     webBrowser->setNamePrefix(
         xi18nc("A prefix for identifiers of web browser widgets. Based on that, identifiers such as "
             "webBrowser1, webBrowser2 are generated. "
             "This string can be used to refer the widget object as variables in programming "
             "languages or macros so it must _not_ contain white spaces and non latin1 characters, "
             "should start with lower case letter and if there are subsequent words, these should "
             "start with upper case letter. Example: smallCamelCase. "
             "Moreover, try to make this prefix as short as possible.",
             "webBrowser"));
     webBrowser->setDescription(xi18n("Web widget with browsing features."));
     webBrowser->setInlineEditingEnabledWhenDataSourceSet(false);
     addClass(webBrowser);
 
     setPropertyDescription("textScale", xi18n("Text Scale"));
     setPropertyDescription("zoomFactor", xi18n("Zoom Factor"));
     setPropertyDescription("url", xi18n("Url"));
 }
 
 WebBrowserFactory::~WebBrowserFactory()
 {
 
 }
 
 QWidget* WebBrowserFactory::createWidget(const QByteArray& classname,
                             QWidget* parent,
                             const char* name,
                             KFormDesigner::Container* container,
                             KFormDesigner::WidgetFactory::CreateWidgetOptions options)
 {
     Q_UNUSED(options);
     QWidget *w = 0;
     QString text(container->form()->library()->textForWidgetName(name, classname));
 
     if (classname == "WebBrowserWidget")
         w = new WebBrowserWidget(parent);
 
     if (w){
         w->setObjectName(name);
         qDebug() << w << w->objectName() << "created";
         return w;
     }
     qWarning() << "w == 0";
     return 0;
 }
 
 bool WebBrowserFactory::createMenuActions(const QByteArray &classname, QWidget *w,
                                     QMenu *menu, KFormDesigner::Container *container)
 {
     Q_UNUSED(classname);
     Q_UNUSED(w);
     Q_UNUSED(menu);
     Q_UNUSED(container);
     return false;
 }
 
 bool WebBrowserFactory::startInlineEditing(InlineEditorCreationArguments& args)
 {
     Q_UNUSED(args);
     return false;
 }
 
 bool WebBrowserFactory::previewWidget(const QByteArray &classname,
                                 QWidget *widget, KFormDesigner::Container *)
 {
     Q_UNUSED(classname);
     Q_UNUSED(widget);
     return true;
 }
 
 #include "WebBrowserFactory.moc"
diff --git a/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.desktop b/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.desktop
deleted file mode 100644
index dbf04f819..000000000
--- a/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.desktop
+++ /dev/null
@@ -1,54 +0,0 @@
-[Desktop Entry]
-Name=Web Browser Widget
-Name[ca]=Estri navegador web
-Name[ca@valencia]=Estri navegador web
-Name[cs]=Widget webového prohlížeče
-Name[de]=Webbrowser-Bedienelement
-Name[en_GB]=Web Browser Widget
-Name[es]=Elemento gráfico de navegador web
-Name[fi]=Verkkoselainelementti
-Name[gl]=Trebello de navegador web
-Name[ia]=Widget de Navigator Web
-Name[it]=Oggetto browser web
-Name[nl]=Webbrowserwidget
-Name[pl]=Element interfejsu przeglądarki sieciowej
-Name[pt]=Elemento de Navegador Web
-Name[pt_BR]=Elemento de navegador Web
-Name[sk]=Widget Webový prehliadač
-Name[sv]=Webbläsarkomponent
-Name[uk]=Віджет перегляду інтернету
-Name[x-test]=xxWeb Browser Widgetxx
-Comment=Kexi plugin providing web browser form widget
-Comment[ca]=Connector del Kexi que proporciona estris de formularis de navegació web
-Comment[ca@valencia]=Connector del Kexi que proporciona estris de formularis de navegació web
-Comment[de]=Kexi-Modul, das ein Webbrowser-Bedienelement bereitstellt
-Comment[en_GB]=Kexi plugin providing web browser form widget
-Comment[es]=Complemento de Kexi que proporciona un elemento gráfico de navegación web para formularios
-Comment[fi]=Kexi-liitännäinen, joka tarjoaa verkkoselaimen lomake-elementin
-Comment[gl]=Complemento para Kexi que fornece un trebello de navegador web para formularios.
-Comment[it]=Estensione che fornisce un oggetto del modulo del browser web di Kexi
-Comment[nl]=Kexi-plug-in levert formulierwidget voor webbrowser
-Comment[pl]=Wtyczka Kexi dostarczająca formularze przeglądania sieci
-Comment[pt]='Plugin' do Kexi que oferece um elemento gráfico de formulários de navegação Web
-Comment[pt_BR]=Plugin do Kexi que oferece um elemento gráfico de formulários de navegação na Web
-Comment[sk]=Kexi plugin poskytujúci webový prehliadač z widgetu
-Comment[sv]=Kexi-insticksprogram som tillhandahåller formulärkomponent med webbläsare
-Comment[uk]=Додаток до Kexi, що забезпечує роботу форми віджета навігатора інтернетом
-Comment[x-test]=xxKexi plugin providing web browser form widgetxx
-Type=Service
-Icon=form
-Encoding=UTF-8
-
-X-KDE-Library=kexiforms_webbrowserwidgetplugin
-X-KDE-ServiceTypes=Kexi/FormWidgets
-X-KDE-PluginInfo-Author=Kexi Team
-X-KDE-PluginInfo-Email=kexi@kde.org
-X-KDE-PluginInfo-Name=org.kexi-project.form.widgets.web
-X-KDE-PluginInfo-Version=3.0
-X-KDE-PluginInfo-Website=http://kexi-project.org
-X-KDE-PluginInfo-Category=
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
-
-X-Kexi-FormWidgetsFactoryGroup=
diff --git a/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json b/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json
new file mode 100644
index 000000000..29ef33862
--- /dev/null
+++ b/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json
@@ -0,0 +1,24 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "kexi@kde.org",
+                "Name": "Kexi Team"
+            }
+        ],
+        "Category": "",
+        "Dependencies": [],
+        "Description": "Kexi plugin providing web browser form widget",
+        "EnabledByDefault": true,
+        "Icon": "kexiform-web-browser",
+        "Id": "org.kexi-project.form.widgets.web-browser",
+        "License": "LGPL",
+        "Name": "Web browser widget",
+        "ServiceTypes": [
+            "Kexi/FormWidget"
+        ],
+        "Version": "3.1",
+        "Website": "http://kexi-project.org"
+    },
+    "X-Kexi-FormWidgetsFactoryGroup": ""
+}
diff --git a/src/plugins/forms/widgets/webbrowser/pics/CMakeLists.txt b/src/plugins/forms/widgets/webbrowser/pics/CMakeLists.txt
new file mode 100644
index 000000000..62e62ad93
--- /dev/null
+++ b/src/plugins/forms/widgets/webbrowser/pics/CMakeLists.txt
@@ -0,0 +1 @@
+kexi_add_plugin_icons_rcc_file(org.kexi-project.form.widgets.web-browser breeze)
diff --git a/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/16/kexiform-web-browser.svg b/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/16/kexiform-web-browser.svg
new file mode 100644
index 000000000..f2a910c3c
--- /dev/null
+++ b/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/16/kexiform-web-browser.svg
@@ -0,0 +1,94 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   viewBox="0 0 16 16"
+   sodipodi:docname="16-actions-kreport_web_element.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="-0.11229892"
+     inkscape:cy="4.8969881"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="960"
+     inkscape:window-x="-8"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4101" />
+    <sodipodi:guide
+       position="2,14.000017"
+       orientation="12,0"
+       id="guide4071" />
+    <sodipodi:guide
+       position="2,2.0000174"
+       orientation="0,12"
+       id="guide4073" />
+    <sodipodi:guide
+       position="14,2.0000174"
+       orientation="-12,0"
+       id="guide4075" />
+    <sodipodi:guide
+       position="14,14.000017"
+       orientation="0,-12"
+       id="guide4077" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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(0,-1036.3622)">
+    <rect
+       style="fill:#6c7a89;fill-opacity:1;stroke:none"
+       id="rect4035"
+       width="0"
+       height="10.999983"
+       x="-17"
+       y="1039.3622" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero"
+       d="m 8,1038.3622 c -3.3137085,0 -6,2.6863 -6,6 0,3.3137 2.6862915,6 6,6 3.313708,0 6,-2.6863 6,-6 0,-3.3137 -2.686292,-6 -6,-6 z m 0,1 c 0.172589,0 0.3319146,0.014 0.5,0.031 0.04034,0 0.084959,0 0.125,0 0.052621,0.01 0.1041519,0.023 0.15625,0.031 0.1436522,0.023 0.2670253,0.059 0.40625,0.094 0.2565966,0.063 0.5107233,0.1487 0.75,0.25 0.131926,0.056 0.249149,0.1209 0.375,0.1875 -7.5e-5,0.01 8e-4,0.02 0,0.031 0.02898,0.013 0.04478,0.067 0.09375,0.094 0.01798,0.01 0.01431,0.022 0.03125,0.031 0.02898,0.016 0.06849,0.034 0.0625,0.062 -0.008,0.04 -0.06575,0.032 -0.09375,0.062 0.0038,0.058 -0.04754,0.055 -0.0625,0.094 0.009,0.025 0.05854,0.033 0.0625,0.062 -0.0049,0.032 -0.07452,0.03 -0.0625,0.062 0.05401,0.042 0.105254,0.01 0.15625,0 0.111991,-0.014 0.212253,-0.01 0.28125,-0.062 -0.009,-0.053 0.09974,-0.046 0.09375,-0.094 0.02866,0.021 0.0653,0.041 0.09375,0.062 -0.01076,0.01 -0.01917,0.026 -0.03125,0.031 -0.02101,0.01 -0.04349,0.019 -0.0625,0.031 -0.028,0.018 -0.06172,0.042 -0.09375,0.062 -0.02299,0.016 -0.06975,0.094 -0.09375,0.094 -0.02899,0 -0.07275,-0.037 -0.09375,-0.031 -0.03003,0.01 -0.02856,0.051 -0.0625,0.062 -0.06599,0.024 -0.195755,-0.036 -0.21875,0.062 0.028,0.057 0.137505,0.031 0.1875,0.062 0.03102,0.02 0.08575,0.091 0.09375,0.125 0.008,0.028 0.01199,0.1575 0,0.1875 -0.03102,0.08 -0.126762,0.063 -0.21875,0.062 l -0.0625,0 c -0.154984,-0.01 -0.305001,-0.08 -0.375,0.031 0.00495,0.085 0.01903,0.1447 0,0.2187 -0.01397,0.054 -0.096748,0.1097 -0.09375,0.1563 0.0011,0.024 0.056505,0.06 0.0625,0.094 0.00385,0.018 -0.00807,0.045 0,0.062 0.026015,0.049 0.079004,-0.01 0.125,0 0.044,0.01 0.09375,0.076 0.09375,0.125 0,0.035 -0.0092,0.091 -0.03125,0.125 -0.044,0.066 -0.124503,0.058 -0.1875,0.094 -0.051975,0.03 -0.062748,0.1046 -0.09375,0.1562 -0.033,0.056 -0.075517,0.076 -0.0625,0.1563 -0.04499,0.089 -0.094512,0.1445 -0.1875,0.1875 -0.027005,0.012 -0.068753,0.013 -0.09375,0.031 -0.02002,0.014 -0.034478,0.062 -0.0625,0.094 -0.03498,0.039 -0.074753,0.064 -0.09375,0.094 -0.014025,0.023 -0.01629,0.062 -0.03125,0.094 -0.022,0.042 -0.065756,0.052 -0.09375,0.094 -0.01298,0.02 -0.01728,0.068 -0.03125,0.094 -0.03201,0.058 -0.068501,0.1052 -0.0625,0.1562 0.00495,0.048 0.059502,0.05 0.0625,0.094 0.00275,0.024 -0.03224,0.036 -0.03125,0.062 0.0011,0.038 0.02828,0.064 0.03125,0.094 0.00699,0.074 -0.04853,0.1057 -0.0625,0.1563 -0.00699,0.024 0.006,0.043 0,0.062 -0.01199,0.037 -0.061499,0.081 -0.0625,0.125 -0.0011,0.031 0.05953,0.05 0.0625,0.094 0.0022,0.029 -0.037245,0.066 -0.03125,0.094 0.011,0.054 0.1142575,0.1142 0.15625,0.1562 0.056997,0.057 0.131258,0.096 0.15625,0.1563 0.02101,0.051 0.023533,0.1494 0.0625,0.1875 0.028985,0.028 0.088007,0.033 0.125,0.062 0.03498,0.027 0.056753,0.033 0.09375,0.062 0.060995,0.048 0.153002,0.1632 0.25,0.1562 0.050985,-0.01 0.099254,-0.053 0.15625,-0.062 0.059,-0.01 0.127506,-0.036 0.1875,-0.031 0.04598,0.01 0.108253,0.034 0.15625,0.031 0.04999,-0.01 0.09926,-0.01 0.15625,-0.031 0.099,-0.043 0.262266,-0.1145 0.40625,-0.094 0.109989,0.016 0.110505,0.1385 0.1875,0.1875 0.08799,0.01 0.148757,-0.017 0.21875,0 0.05302,0.013 0.120001,0.083 0.125,0.125 0.005,0.043 -0.05651,0.098 -0.0625,0.125 -0.01397,0.058 0.01,0.1193 0,0.1563 -0.008,0.029 -0.03224,0.065 -0.03125,0.094 0,0.026 0.03548,0.091 0.0625,0.125 0.033,0.042 0.085,0.08 0.125,0.125 0.07299,0.084 0.105254,0.1703 0.15625,0.2813 0.01298,0.028 -0.01199,0.058 0,0.094 -0.022,0.1679 -0.07751,0.2829 -0.1875,0.4688 -0.05198,0.06 -0.126001,0.1126 -0.125,0.1875 -0.0038,0.18 0.10175,0.2947 0.09375,0.4687 -0.01798,0.2339 0.01804,0.2501 0,0.375 0.079,0.04 0.02299,0.1669 0,0.25 -0.03399,0.099 -0.07475,0.1215 -0.09375,0.1875 0.05308,0.023 0.128521,0.014 0.1875,0 -0.0298,0.031 -0.06316,0.063 -0.09375,0.094 -0.226206,0.2262 -0.483998,0.4452 -0.75,0.625 -0.516043,0.3486 -1.0900087,0.6134 -1.71875,0.75 -0.343539,0.075 -0.6966113,0.094 -1.0625,0.094 -0.1903331,0 -0.3781349,-0.01 -0.5625,-0.031 -0.1468611,-0.017 -0.2947861,-0.033 -0.4375,-0.062 -0.2831745,-0.058 -0.5489719,-0.1777 -0.8125,-0.2813 -0.00937,-0.017 -0.033376,-0.042 -0.03125,-0.062 0.051975,-0.022 0.149506,0.074 0.1875,0 0.01903,-0.035 -0.025025,-0.1212 0,-0.1562 0.017985,-0.024 0.119257,-0.024 0.15625,-0.031 0.05302,-0.01 0.126253,-0.017 0.15625,-0.031 0.033,-0.021 0.068501,-0.095 0.0625,-0.1563 -0.00275,-0.029 -0.039565,-0.036 -0.0625,-0.062 -0.018975,-0.022 0.01298,-0.042 0,-0.062 -0.02398,-0.035 -0.083751,-0.043 -0.09375,-0.094 0.071995,-0.014 0.1772615,0.06 0.28125,0.031 0.049005,-0.014 0.133249,-0.1101 0.15625,-0.1562 0.00699,-0.014 -0.00798,-0.044 0,-0.062 0.00902,-0.018 0.028225,-0.053 0.03125,-0.062 0.00698,-0.027 -0.006,-0.013 0,-0.031 0.017985,-0.051 0.063747,-0.089 0.09375,-0.125 0.02299,-0.028 0.072723,-0.065 0.09375,-0.094 0.02398,-0.031 0.0153,-0.034 0.03125,-0.062 0.015015,-0.091 -0.05325,-0.1701 -0.03125,-0.25 0.02398,-0.09 0.163012,-0.1465 0.25,-0.1875 0.029975,-0.014 0.068752,-0.022 0.09375,-0.031 0.059994,-0.021 0.1315045,-0.043 0.1875,-0.062 0.093995,-0.034 0.110248,-0.1016 0.15625,-0.1875 0.022,-0.04 0.058485,-0.096 0.0625,-0.125 0.00385,-0.026 -0.00495,-0.032 0,-0.062 0.00495,-0.029 -0.00798,-0.06 0,-0.094 0.011,-0.043 0.03125,-0.1396 0.03125,-0.1875 0,-0.04 -0.03026,-0.058 -0.03125,-0.094 -0.00699,-0.13 0.045762,-0.1165 0.09375,-0.1875 0.02398,-0.035 0.04556,-0.1 0.0625,-0.125 0.080993,-0.12 0.228749,-0.1617 0.21875,-0.3437 -0.00385,-0.06 -0.049772,-0.1998 -0.09375,-0.2188 -0.025025,-0.011 -0.056751,-0.018 -0.09375,-0.031 -0.1179915,-0.044 -0.2207645,-0.1775 -0.34375,-0.1875 l -0.0625,0 c -0.048015,0 -0.1022565,-0.024 -0.15625,-0.031 -0.03399,-0.01 -0.1050015,0.01 -0.125,0 -0.03102,-0.015 -0.03753,-0.077 -0.0625,-0.094 -0.02002,-0.014 -0.062757,-0.02 -0.09375,-0.031 -0.049005,-0.018 -0.068003,-0.059 -0.125,-0.062 -0.017985,0 -0.042518,0.01 -0.0625,0 -0.03102,-0.01 -0.064754,-0.013 -0.09375,-0.031 -0.03597,-0.022 -0.078752,-0.031 -0.09375,-0.062 0.033,-0.1079 -0.07175,-0.1245 -0.09375,-0.1875 -0.01001,-0.029 0.01001,-0.099 0,-0.125 -0.01298,-0.037 -0.052748,-0.063 -0.09375,-0.094 -0.071995,-0.056 -0.115757,-0.081 -0.21875,-0.094 -0.04598,-0.01 -0.1012555,0.01 -0.15625,0 -0.057992,-0.01 -0.1435055,-0.044 -0.1875,-0.094 -0.04202,-0.049 -0.056756,-0.1019 -0.09375,-0.125 -0.03498,-0.022 -0.069754,-0.04 -0.09375,-0.062 -0.011,-0.01 -0.02124,-0.01 -0.03125,-0.031 -0.017985,-0.037 -0.05325,-0.049 -0.03125,-0.094 -0.039985,-0.02 -0.019507,0.038 -0.0625,0.031 -0.038995,-0.055 -0.068262,-0.1098 -0.15625,-0.094 -0.039985,0.01 -0.078003,0.093 -0.125,0.094 -0.038995,0 -0.074004,-0.086 -0.125,-0.094 -0.038995,-0.01 -0.098,0.036 -0.125,0.031 -0.04301,-0.01 -0.054777,-0.036 -0.09375,-0.062 -0.028985,-0.019 -0.07775,-0.063 -0.09375,-0.062 -0.049995,0 -0.087258,0.099 -0.15625,0.062 -0.03399,-0.043 0.071268,-0.054 0.03125,-0.094 -0.029975,-0.029 -0.038487,0.017 -0.0625,0.031 -0.027995,0.018 -0.062757,0.02 -0.09375,0.031 -0.068998,0.026 -0.1335065,0.034 -0.1875,0.062 -0.049995,0.026 -0.064753,0.043 -0.09375,0.094 -0.02299,0.042 -0.058753,0.123 -0.09375,0.125 -0.04202,0 -0.05575,-0.045 -0.09375,-0.062 -0.1149885,-0.05 -0.1862595,0.029 -0.28125,0.031 -0.087994,0 -0.2227485,-0.1357 -0.21875,-0.2187 0.00275,-0.051 0.025255,-0.1245 0.03125,-0.1875 0.00495,-0.05 0.061565,-0.1107 0.0625,-0.1563 0.0011,-0.062 -0.116254,-0.087 -0.15625,-0.094 -0.093995,-0.017 -0.2055085,0.042 -0.3125,0 -0.02002,-0.034 0.01926,-0.06 0.03125,-0.094 0.00698,-0.018 -0.00699,-0.042 0,-0.062 0.01199,-0.032 0.078757,-0.06 0.09375,-0.094 0.011,-0.026 -0.011,-0.061 0,-0.094 0.01298,-0.036 0.059475,-0.068 0.0625,-0.094 0.00385,-0.034 -0.03555,-0.072 -0.0625,-0.094 -0.082995,0.01 -0.1395015,0.01 -0.1875,0.031 -0.107987,0.049 -0.078507,0.1847 -0.1875,0.2187 -0.037015,0.012 -0.083002,0.024 -0.125,0.031 -0.018315,0.01 -0.04198,0 -0.0625,0 0.00195,-0.01 -0.00201,-0.021 0,-0.031 0.00466,-0.023 0.026279,-0.04 0.03125,-0.062 0.071265,-0.325 0.1813949,-0.6396 0.3125,-0.9375 l 0.03125,0 c 0.038005,0.01 0.060755,0.06 0.09375,0.062 0.091993,0.01 0.111501,-0.085 0.1875,-0.125 0.077996,0.011 0.116506,-0.01 0.1875,0 0.048015,0.01 0.118256,0.058 0.15625,0.062 0.03201,0 0.032498,-0.035 0.0625,-0.031 0.029975,0.01 0.08875,0.058 0.09375,0.094 0.00495,0.045 -0.044285,0.1067 -0.03125,0.1563 0.047025,0.048 0.1517545,0.066 0.21875,0.094 0.044,-0.037 0.00698,-0.1042 0,-0.1562 -0.0011,-0.023 0.00275,-0.073 0,-0.094 -0.00495,-0.036 -0.03125,-0.063 -0.03125,-0.094 0,-0.143 0.1227585,-0.1941 0.21875,-0.25 0.040975,-0.024 0.089002,-0.076 0.125,-0.094 0.050985,-0.025 0.083003,-0.01 0.125,-0.031 0.075988,-0.043 0.1285015,-0.1076 0.1875,-0.1563 0.027005,-0.065 -0.00275,-0.1547 0,-0.2187 0.027005,-0.017 0.064782,0 0.09375,0 0.04598,-0.01 0.067746,-0.068 0.09375,-0.094 0.015015,-0.015 0.044482,-0.016 0.0625,-0.031 0.04598,-0.036 0.053737,-0.078 0.09375,-0.094 0.014025,-0.01 0.040473,-0.024 0.0625,-0.031 0.03003,-0.01 0.077007,-0.013 0.125,-0.031 0.03102,-0.011 0.112999,-0.018 0.125,-0.031 0.015015,-0.015 -0.00385,-0.071 0,-0.094 0.02398,-0.1129 0.180259,-0.1181 0.28125,-0.1562 0.069993,-0.026 0.1407545,-0.1078 0.21875,-0.094 -0.015015,0.054 -0.075501,0.06 -0.0625,0.125 0.016995,0.091 0.124251,-0.018 0.15625,-0.031 0.060995,-0.026 0.1700025,-0.064 0.25,-0.094 0.069993,-0.025 0.190989,-0.044 0.125,-0.125 -0.055,-0.01 -0.077007,0.043 -0.125,0.062 -0.033,0.01 -0.034522,-0.028 -0.0625,-0.031 -0.027005,0 -0.035473,0.036 -0.0625,0.031 -0.027005,-0.01 -0.058502,-0.061 -0.0625,-0.094 -0.011,-0.084 0.05976,-0.094 0.09375,-0.1563 -0.02299,-0.076 -0.1235075,-0.033 -0.1875,-0.062 0.00699,-0.045 0.040757,-0.084 0.09375,-0.094 0.04301,-0.01 0.1615015,0.01 0.1875,0.031 0.015015,0.013 -0.02294,0.042 0,0.062 0.026015,0.023 0.059754,0.01 0.09375,0 0.01199,-0.057 -0.072499,-0.025 -0.0625,-0.062 0.067991,-0.044 0.198255,-0.02 0.28125,-0.031 0.048015,-0.01 0.113251,-0.039 0.15625,-0.062 0.039985,-0.023 0.051751,-0.069 0.09375,-0.031 0.01199,0.041 -0.00831,0.072 -0.03125,0.094 -0.076994,0.068 -0.158756,0.1398 -0.21875,0.2187 0.037015,0.036 0.094254,0.024 0.15625,0.031 0.02398,0.01 0.068747,0 0.09375,0 0.03003,0.01 0.069748,-0.01 0.09375,0 0.04202,0.01 0.051757,0.094 0.09375,0.094 0.067996,0 0.039023,-0.08 0,-0.125 0.01199,-0.047 0.0483,-0.092 0.03125,-0.125 -0.03102,-0.062 -0.1502495,0.018 -0.15625,-0.062 -0.00385,-0.05 0.044493,-0.056 0.0625,-0.094 -0.00798,-0.096 0.072499,-0.1005 0.0625,-0.1875 -0.00495,-0.036 -0.037492,-0.028 -0.0625,-0.062 -0.01298,-0.018 -0.01629,-0.08 -0.03125,-0.094 -0.051975,-0.044 -0.1502495,-0.01 -0.15625,-0.094 -0.00275,-0.05 0.00698,-0.1027 0,-0.1563 -0.00699,-0.051 -0.049772,-0.2087 -0.09375,-0.2187 -0.055995,-0.012 -0.089255,0.094 -0.15625,0.125 -0.03597,0.017 -0.119257,0.037 -0.15625,0.031 -0.02398,-0.01 -0.059497,-0.015 -0.0625,-0.062 -0.00396,-0.042 0.046847,-0.061 0.0625,-0.094 0.00391,-0.01 -0.00199,-0.02 0,-0.031 0.072566,-0.02 0.1449664,-0.045 0.21875,-0.062 0.041917,-0.01 0.082687,-0.023 0.125,-0.031 0.029877,-0.01 0.063685,0.01 0.09375,0 0.1335544,-0.025 0.2691958,-0.049 0.40625,-0.062 0.1662387,-0.017 0.3289018,-0.031 0.5,-0.031 z m -2.03125,0.4688 c -0.031834,0.1825 -0.2027474,0.2552 -0.40625,0.25 -0.04598,0.044 -0.00628,0.1265 -0.03125,0.1875 -0.02101,0.051 -0.105259,0.098 -0.15625,0.094 -0.037015,0 -0.09375,-0.059 -0.09375,-0.094 0,-0.043 0.068271,-0.045 0.03125,-0.094 0.00165,-0.01 0.020855,-0.021 0.03125,-0.031 0.02024,-0.013 0.042103,-0.019 0.0625,-0.031 0.1812025,-0.1115 0.3669614,-0.1932 0.5625,-0.2812 z m 4.1875,0.1875 c -0.01843,0.01 -0.01503,0.021 -0.03125,0.031 -0.03801,0.023 -0.06474,0.052 -0.09375,0.062 -0.04097,0.015 -0.087746,0.025 -0.09375,0.062 -0.00495,0.031 0.032295,0.034 0.03125,0.062 -0.015015,0.037 -0.02322,0.049 -0.03125,0.094 0.050985,0.083 0.155758,-0.018 0.21875,-0.031 0.028,-0.01 0.0475,-0.01 0.0625,-0.031 0.01699,-0.027 0.01831,-0.056 0.03125,-0.094 0.01403,-0.042 0.06751,-0.057 0.0625,-0.094 -0.0038,-0.037 -0.09426,-0.067 -0.15625,-0.062 z m -5.46875,0.625 c 0.047412,0.038 0.1140588,0.1206 0.03125,0.1562 -0.01001,0.01 -0.1322535,0.035 -0.15625,0.031 -0.00968,0 -0.022766,-0.024 -0.03125,-0.031 0.051663,-0.05 0.1024569,-0.1082 0.15625,-0.1562 z m 0.1875,0.1875 c 0.02398,0 0.034483,0.061 0.0625,0.062 0.027005,0 0.046473,-0.035 0.0625,-0.031 0.04202,0.011 0.071268,0.094 0.03125,0.125 -0.033,0.01 -0.038537,-0.035 -0.0625,-0.031 -0.067996,0.012 -0.1052545,0.1602 -0.15625,0.1562 -0.048015,-0.01 -0.080272,-0.1212 -0.03125,-0.1562 0.0011,-0.03 -0.00204,-0.031 0,-0.062 0.015015,-0.018 0.053732,-0.065 0.09375,-0.062 z m -0.25,0.031 c 0.014025,0 0.026245,-0.01 0.03125,0 -0.00698,0.053 -0.021542,0.069 -0.0625,0.094 -0.070994,0.043 -0.133249,0.096 -0.15625,0.1875 -0.00699,0.027 -0.091004,0.1004 -0.125,0.094 -0.078996,-0.017 0.044515,-0.1646 0.0625,-0.1875 0.02002,-0.025 0.039526,-0.034 0.0625,-0.062 0.02299,-0.028 0.040555,-0.078 0.0625,-0.094 0.02398,-0.017 0.083007,-0.033 0.125,-0.031 z m 6.78125,0.1563 c 0.07899,-0.01 0.120252,0.077 0.15625,0.125 0.02998,0.039 0.107246,0.098 0.15625,0.125 0.028,0.015 0.06275,0.049 0.09375,0.062 0.06499,0.029 0.184496,0.1235 0.1875,0.1875 0.0011,0.032 -0.03626,0.064 -0.03125,0.094 0.04901,0.01 0.09275,-0.076 0.09375,-0.125 0.09191,0.13 0.170602,0.2677 0.25,0.4063 0.0375,0.065 0.09044,0.12 0.125,0.1875 -0.04411,0.013 -0.05541,0.02 -0.0625,0.062 -0.01001,0.056 0.02149,0.1463 -0.0625,0.1562 -0.05297,0.01 -0.11451,-0.045 -0.1875,-0.062 -0.02998,-0.01 -0.06975,0.01 -0.09375,0 -0.055,-0.018 -0.04675,-0.092 -0.09375,-0.125 -0.02701,-0.019 -0.113247,-0.058 -0.15625,-0.062 -0.02701,0 -0.03452,0.01 -0.0625,0 -0.03399,-0.01 -0.097,0.014 -0.125,0 -0.02701,-0.017 -0.08674,-0.071 -0.09375,-0.094 -0.011,-0.037 0.09175,-0.062 0.09375,-0.094 0.0022,-0.024 -0.02625,-0.057 -0.03125,-0.094 -0.0038,-0.022 0.0049,-0.047 0,-0.062 -0.007,-0.026 -0.05276,-0.03 -0.09375,-0.031 -0.03603,0 -0.06276,0 -0.09375,0 -0.044,0 -0.132506,0 -0.1875,0 -0.033,0 -0.06275,0 -0.09375,0 -0.08699,0.01 -0.150753,-0.01 -0.21875,0 -0.04901,0 -0.141504,0.042 -0.1875,0.062 -0.02299,0.011 -0.03249,0.016 -0.0625,0.031 -0.01397,0.01 -0.04446,0.023 -0.0625,0.031 -0.02799,0.013 -0.06675,0.054 -0.09375,0.062 -0.03899,0.01 -0.08526,-0.01 -0.15625,0 -0.05098,0 -0.123999,-0.033 -0.125,-0.094 -0.0011,-0.093 0.162011,-0.045 0.25,-0.062 0.033,-0.01 0.05373,-0.038 0.09375,-0.062 0.01903,-0.011 0.01326,-0.019 0.03125,-0.031 0.02997,-0.021 0.08875,-0.07 0.09375,-0.094 0.0038,-0.022 -0.003,-0.045 0,-0.062 0.0038,-0.021 0.0355,-0.034 0.0625,-0.062 0.04202,-0.042 0.073,-0.098 0.125,-0.125 0.03498,-0.018 0.07775,-0.034 0.09375,-0.062 0.0038,-0.032 -0.0011,-0.032 0,-0.062 0.022,-0.02 0.04452,-0.027 0.0625,-0.031 0.05401,-0.012 0.09326,0 0.15625,0 0.027,0 0.06475,0.013 0.09375,0 0.02398,-0.016 0.0385,-0.051 0.0625,-0.062 0.02601,-0.014 0.06172,-0.029 0.09375,-0.031 z m 0.5625,0.5937 -0.125,0 c -0.044,0 -0.099,-0.023 -0.125,0 0.03702,0.06 0.104505,0.079 0.1875,0.094 0.02998,-0.022 0.04853,-0.055 0.0625,-0.094 z m -6.84375,-0.5625 0.09375,0 c 0.025025,0 0.052501,-0.01 0.0625,0 -0.016005,0.066 -0.166753,0.055 -0.21875,0.031 0.00275,-0.025 0.030468,-0.027 0.0625,-0.031 z m -0.21875,0.125 c -0.043683,0.032 -0.086919,0.072 -0.15625,0.094 -0.038005,0.012 -0.086748,0.011 -0.09375,-0.031 -0.00803,-0.052 0.059738,-0.026 0.09375,-0.031 0.044,-0.01 0.105254,-0.029 0.15625,-0.031 z m 6.5,0 c -0.033,0.011 -0.04901,0.084 0,0.094 0.02299,-0.014 0.0373,-0.051 0.03125,-0.094 -0.01298,-0.014 -0.02129,-0.01 -0.03125,0 z m -0.0625,0.1563 c 0.0011,0.056 0.011,0.1076 0,0.1562 0.03201,0.062 0.109006,0.011 0.125,-0.031 0.01903,-0.104 -0.0145,-0.138 -0.0625,-0.125 -0.016,0.01 -0.04556,-0.013 -0.0625,0 z m -8.28125,2.3437 c 0.056364,0.051 0.088793,0.1229 0.15625,0.1563 0.025025,0.013 0.061751,0.023 0.09375,0.031 0.026015,0.01 0.037513,-0.01 0.0625,0 0.05302,0.018 0.1142575,0.043 0.15625,0.062 0.063998,0.028 0.1325,0.1243 0.1875,0.1563 0.00275,0.032 -0.01001,0.07 0,0.094 0.026015,0.035 0.051747,0.07 0.09375,0.094 0.050985,0.028 0.077006,0.072 0.125,0.094 0.016995,0.01 0.036463,-0.01 0.0625,0 0.065994,0.02 0.099253,0.1106 0.15625,0.094 0.037015,-0.011 0.025255,-0.058 0.03125,-0.094 0.025025,-0.027 0.054722,-0.062 0.09375,-0.062 0.06199,0 0.070749,0.096 0.09375,0.1563 0.01298,0.034 0.053535,0.058 0.0625,0.094 0.015015,0.062 0.01298,0.2443 0,0.2813 -0.016005,0.046 -0.087001,0.043 -0.125,0.094 -0.017985,0.024 -0.01728,0.077 -0.03125,0.094 -0.02398,0.029 -0.044477,0.035 -0.0625,0.062 -0.01001,0.015 -0.022285,0.042 -0.03125,0.062 -0.03003,0.064 -0.087514,0.1105 -0.0625,0.1875 0.01001,0.031 0.0625,0.057 0.0625,0.094 0,0.044 -0.086749,0.077 -0.09375,0.125 -0.00495,0.035 0.020305,0.078 0.03125,0.125 0.00798,0.035 0.072751,0.071 0.09375,0.094 0.03498,0.039 0.061751,0.1067 0.09375,0.1562 0.062991,0.097 0.094265,0.2175 0.15625,0.3125 0.033,0.049 0.103,0.073 0.125,0.125 0.011,0.026 -0.01001,0.07 0,0.094 0.03597,0.081 0.200257,0.1788 0.28125,0.2187 0.038005,0.019 0.090009,0.011 0.125,0.031 0.05302,0.03 0.160506,0.1096 0.1875,0.1562 0.02398,0.042 0.01926,0.1519 0.03125,0.2188 0.015015,0.088 -0.00385,0.1549 0,0.25 0.00275,0.052 0.03125,0.073 0.03125,0.125 0,0.018 0.0011,0.075 0,0.094 -0.0011,0.062 0.00495,0.1245 0,0.1875 -0.00275,0.034 -0.0022,0.065 0,0.094 0.00275,0.031 0.02927,0.035 0.03125,0.062 0.0022,0.029 -0.034275,0.071 -0.03125,0.094 0.00699,0.063 0.050499,0.098 0.0625,0.1563 0.01001,0.046 0.037245,0.1637 0.03125,0.2187 -0.00385,0.029 -0.027235,0.061 -0.03125,0.094 -0.00275,0.026 0.00385,0.039 0,0.062 -0.00275,0.023 0.00594,0.043 0,0.062 -0.031846,-0.02 -0.062405,-0.041 -0.09375,-0.062 -0.2660017,-0.1798 -0.5237945,-0.3988 -0.75,-0.625 -0.030593,-0.031 -0.063954,-0.062 -0.09375,-0.094 -0.1805809,-0.1901 -0.3508625,-0.4083 -0.5,-0.625 -0.013513,-0.02 -0.018011,-0.043 -0.03125,-0.062 -0.1730464,-0.2593 -0.3146857,-0.5221 -0.4375,-0.8125 -0.00886,-0.021 -0.022673,-0.041 -0.03125,-0.062 -0.1053774,-0.259 -0.1889264,-0.534 -0.25,-0.8125 -0.011526,-0.053 -0.021392,-0.1031 -0.03125,-0.1562 -0.024762,-0.1336 -0.048581,-0.2692 -0.0625,-0.4063 C 3.01418,1044.6941 3,1044.5348 3,1044.3622 c 0,-0.2376 0.030436,-0.4587 0.0625,-0.6875 z M 5,1044.206 c 0.048015,-0.022 0.038995,0.056 0,0.062 -0.037015,0.01 -0.03597,-0.044 0,-0.062 z"
+       id="path26" />
+  </g>
+</svg>
diff --git a/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/22/kexiform-web-browser.svg b/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/22/kexiform-web-browser.svg
new file mode 100644
index 000000000..840c3883e
--- /dev/null
+++ b/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/22/kexiform-web-browser.svg
@@ -0,0 +1,125 @@
+<?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="22"
+   height="22"
+   id="svg3869"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="22-actions-kreport_web_element.svg">
+  <defs
+     id="defs3871" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627416"
+     inkscape:cx="7.6255284"
+     inkscape:cy="12.779481"
+     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="1280"
+     inkscape:window-height="960"
+     inkscape:window-x="-8"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4132" />
+    <sodipodi:guide
+       position="2,20.000017"
+       orientation="18,0"
+       id="guide4138" />
+    <sodipodi:guide
+       position="2,2.0000174"
+       orientation="0,18"
+       id="guide4140" />
+    <sodipodi:guide
+       position="20,2.0000174"
+       orientation="-18,0"
+       id="guide4142" />
+    <sodipodi:guide
+       position="20,20.000017"
+       orientation="0,-18"
+       id="guide4144" />
+    <sodipodi:guide
+       position="3,19.000017"
+       orientation="16,0"
+       id="guide4146" />
+    <sodipodi:guide
+       position="3,3.0000174"
+       orientation="0,16"
+       id="guide4148" />
+    <sodipodi:guide
+       position="19,3.0000174"
+       orientation="-16,0"
+       id="guide4150" />
+    <sodipodi:guide
+       position="19,19.000017"
+       orientation="0,-16"
+       id="guide4152" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3874">
+    <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(-326,-534.3622)">
+    <rect
+       style="fill:#04896a;fill-opacity:1;stroke:none"
+       id="rect4035"
+       width="0"
+       height="10.999983"
+       x="287.74176"
+       y="526.70184" />
+    <path
+       id="path3011"
+       d="m 337.00405,537.3622 c -0.31896,0 -0.62792,0.026 -0.93788,0.063 -0.30396,0.036 -0.61392,0.087 -0.90589,0.1559 -0.094,0.022 -0.18497,0.067 -0.28096,0.094 -0.084,0.023 -0.16698,0.037 -0.24997,0.063 -0.10499,0.033 -0.21397,0.059 -0.31296,0.094 -0.10699,0.038 -0.20697,0.083 -0.31296,0.1249 -0.20597,0.083 -0.39695,0.182 -0.59393,0.2809 -0.071,0.036 -0.14898,0.056 -0.21897,0.094 -0.22997,0.1209 -0.44094,0.2629 -0.65592,0.4058 -0.082,0.055 -0.16997,0.098 -0.24996,0.1559 -0.033,0.024 -0.061,0.038 -0.094,0.063 -0.094,0.071 -0.19098,0.1418 -0.28097,0.2188 -0.10698,0.089 -0.20997,0.1869 -0.31296,0.2809 -0.032,0.03 -0.062,0.064 -0.094,0.094 -0.011,0.011 -0.02,0.02 -0.031,0.031 -0.016,0.016 -0.015,0.047 -0.031,0.063 -0.20997,0.2039 -0.43894,0.3988 -0.62492,0.6247 -0.005,0.01 0.005,0.025 0,0.031 -0.18098,0.2199 -0.34296,0.4478 -0.49994,0.6877 -0.021,0.032 -0.042,0.061 -0.063,0.094 -0.015,0.024 -0.047,0.037 -0.063,0.063 -0.06,0.098 -0.10099,0.209 -0.15598,0.3129 -0.018,0.033 -0.045,0.061 -0.063,0.094 -0.075,0.1459 -0.14998,0.2898 -0.21897,0.4378 -0.004,0.01 0.004,0.023 0,0.031 -0.11699,0.2528 -0.22198,0.5136 -0.31296,0.7805 -0.019,0.053 -0.045,0.103 -0.063,0.156 -0.003,0.01 0.003,0.022 0,0.031 -0.02,0.062 -0.044,0.125 -0.063,0.188 -0.073,0.2568 -0.13998,0.5137 -0.18798,0.7806 -0.034,0.1919 -0.074,0.3968 -0.094,0.5938 -0.027,0.2648 -0.031,0.5417 -0.031,0.8125 0,0.4038 0.036,0.7996 0.094,1.1875 0.006,0.041 -0.007,0.085 0,0.1249 0.044,0.2659 0.11798,0.5248 0.18798,0.7807 0.026,0.096 0.064,0.1859 0.094,0.2809 0.04,0.1289 0.079,0.2489 0.12499,0.3748 0.077,0.2119 0.15598,0.4218 0.24997,0.6246 0.05,0.106 0.10198,0.2099 0.15598,0.3129 0.15198,0.2919 0.31496,0.5747 0.49993,0.8436 0.016,0.024 0.046,0.039 0.063,0.063 0.19797,0.2809 0.39395,0.5597 0.62492,0.8126 0.04,0.044 0.084,0.082 0.12498,0.125 0.04,0.042 0.084,0.084 0.12499,0.1249 0.21397,0.2139 0.45094,0.4048 0.68791,0.5938 0.30596,0.2438 0.62892,0.4587 0.96888,0.6556 0.012,0.01 0.019,0.024 0.031,0.031 0.053,0.03 0.10299,0.065 0.15598,0.094 0.31596,0.156 0.69192,0.3249 0.93788,0.4378 0.10999,0.042 0.23098,0.057 0.34396,0.094 0.053,0.018 0.10299,0.046 0.15598,0.063 0.13598,0.041 0.26797,0.09 0.40595,0.1249 0.042,0.011 0.083,0.021 0.12499,0.031 0.29196,0.069 0.60192,0.1209 0.90588,0.1559 0.30896,0.036 0.61792,0.063 0.93788,0.063 0.33996,0 0.67092,-0.021 0.99988,-0.063 0.36495,-0.048 0.68091,-0.1239 0.99987,-0.1879 1.69779,-0.4358 3.1616,-1.4213 4.21847,-2.7487 0.028,-0.035 0.067,-0.058 0.094,-0.094 0.009,-0.012 0.022,-0.02 0.031,-0.031 0.014,-0.018 0.018,-0.044 0.031,-0.063 0.62292,-0.8246 1.07686,-1.7801 1.34383,-2.8117 0.056,-0.2169 0.11799,-0.4318 0.15598,-0.6557 0.005,-0.03 -0.005,-0.063 0,-0.094 0.006,-0.04 0.025,-0.079 0.031,-0.125 0.006,-0.043 0.026,-0.082 0.031,-0.1249 l -0.031,0 c 0.044,-0.3289 0.094,-0.6587 0.094,-0.9996 0,-0.5517 -0.05,-1.1034 -0.15598,-1.6242 -0.009,-0.043 -0.022,-0.082 -0.031,-0.1249 -0.046,-0.2079 -0.12398,-0.4229 -0.18798,-0.6248 -0.003,-0.01 0.003,-0.022 0,-0.031 -0.012,-0.038 -0.018,-0.056 -0.031,-0.094 -0.039,-0.119 -0.081,-0.2579 -0.12498,-0.3748 -0.012,-0.032 -0.018,-0.064 -0.031,-0.094 -0.043,-0.109 -0.10799,-0.2059 -0.15598,-0.3128 -0.002,0 0.002,-0.026 0,-0.031 -0.025,-0.054 -0.068,-0.1029 -0.094,-0.1559 -0.098,-0.2029 -0.19797,-0.3998 -0.31296,-0.5937 -0.058,-0.098 -0.094,-0.2169 -0.15598,-0.3129 -0.024,-0.036 -0.069,-0.058 -0.094,-0.094 -0.067,-0.099 -0.14698,-0.185 -0.21897,-0.2809 -0.08,-0.1 -0.13999,-0.2159 -0.21898,-0.3129 -0.005,-0.01 0.005,-0.025 0,-0.031 -0.17197,-0.2089 -0.36995,-0.4028 -0.56292,-0.5937 -0.093,-0.092 -0.18398,-0.1939 -0.28097,-0.2809 -0.028,-0.025 -0.065,-0.038 -0.094,-0.063 -0.20897,-0.1819 -0.42994,-0.3398 -0.65592,-0.4996 -0.055,-0.038 -0.10098,-0.088 -0.15598,-0.125 -0.07,-0.046 -0.14798,-0.081 -0.21897,-0.1249 -0.13498,-0.084 -0.26597,-0.174 -0.40595,-0.2499 -0.12298,-0.067 -0.24797,-0.127 -0.37495,-0.1879 -0.21397,-0.102 -0.43195,-0.198 -0.65592,-0.2809 -0.26596,-0.099 -0.53393,-0.1799 -0.8129,-0.2499 -0.24496,-0.062 -0.49693,-0.118 -0.7499,-0.1559 -0.39695,-0.061 -0.8049,-0.094 -1.21885,-0.094 m 0,0.9996 c 0.29896,0 0.58493,0.027 0.87489,0.063 0.17998,0.023 0.35496,0.058 0.53093,0.094 0.01,0 0.021,0 0.031,0 0.16598,0.035 0.33796,0.079 0.49994,0.1249 0.096,0.027 0.18698,0.063 0.28097,0.094 0.17197,0.057 0.33395,0.1169 0.49993,0.1879 0.19398,0.08 0.37896,0.1528 0.56293,0.2498 -0.031,0.01 -0.063,0.021 -0.094,0.031 -0.047,0.017 -0.11298,0.096 -0.12498,0.1249 -0.02,0.048 0.005,0.115 0,0.188 0.038,0.017 0.06,0.089 0.12498,0.1249 0.025,0.014 0.041,-0.01 0.063,0 0.038,0.021 0.07,0.087 0.063,0.1249 -0.011,0.055 -0.088,0.022 -0.12498,0.063 0.006,0.078 -0.043,0.105 -0.063,0.1559 0.012,0.033 0.057,0.024 0.063,0.063 -0.007,0.043 -0.079,0.049 -0.063,0.094 0.072,0.056 0.15098,-0.022 0.21897,-0.031 0.14898,-0.019 0.28297,0.041 0.37495,-0.031 -0.012,-0.071 0.10099,-0.092 0.094,-0.1559 -0.006,-0.048 -0.09,-0.061 -0.12498,-0.094 -0.019,-0.018 -0.04,-0.059 -0.063,-0.094 -0.026,-0.04 -0.064,-0.087 -0.094,-0.125 -0.039,-0.052 -0.12498,-0.1169 -0.12498,-0.1559 0.001,-0.045 0.052,-0.063 0.063,-0.125 -0.012,-0.057 -0.11699,0 -0.12499,-0.063 0.002,-0.019 0.021,-0.051 0.031,-0.063 0.14998,0.082 0.29796,0.1789 0.43795,0.2809 0.032,0.021 0.062,0.041 0.094,0.063 0.10798,0.081 0.20697,0.17 0.31296,0.2499 -0.067,0.012 -0.10099,0.09 -0.15598,0.156 -0.038,0.046 -0.099,0.1009 -0.15598,0.1249 -0.028,0.012 -0.068,-0.016 -0.094,0 -0.037,0.025 -0.051,0.096 -0.094,0.125 -0.031,0.021 -0.12399,0.094 -0.15598,0.094 -0.038,10e-4 -0.098,-0.04 -0.12499,-0.031 -0.04,0.013 -0.017,0.077 -0.063,0.094 -0.088,0.031 -0.24997,-0.069 -0.28096,0.063 0.038,0.076 0.15298,0.051 0.21897,0.094 0.042,0.026 0.11399,0.143 0.12498,0.1879 0.01,0.038 0.015,0.179 0,0.2189 -0.041,0.106 -0.15898,0.097 -0.28096,0.094 -0.034,-10e-4 -0.063,0 -0.094,0 -0.20697,-0.014 -0.40695,-0.085 -0.49994,0.063 0.007,0.1129 0.025,0.1829 0,0.2808 -0.018,0.072 -0.097,0.125 -0.094,0.188 0.002,0.032 0.055,0.082 0.063,0.1249 0.005,0.023 -0.011,0.073 0,0.094 0.034,0.066 0.12699,-0.01 0.18798,0 0.059,0.01 0.12598,0.1209 0.12498,0.1879 -10e-4,0.046 -0.033,0.1119 -0.063,0.1559 -0.058,0.089 -0.16698,0.077 -0.24997,0.1249 -0.07,0.039 -0.084,0.1189 -0.12498,0.1879 -0.044,0.074 -0.081,0.1109 -0.063,0.2189 -0.06,0.1179 -0.12598,0.1939 -0.24997,0.2499 -0.037,0.017 -0.092,0.039 -0.12498,0.063 -0.027,0.019 -0.056,0.051 -0.094,0.094 -0.047,0.052 -0.1,0.085 -0.12499,0.125 -0.019,0.031 -0.01,0.084 -0.031,0.1249 -0.029,0.056 -0.088,0.1 -0.12498,0.1559 -0.017,0.026 -0.043,0.059 -0.063,0.094 -0.042,0.077 -0.10099,0.1509 -0.094,0.2189 0.007,0.066 0.089,0.068 0.094,0.1249 0.004,0.032 -0.033,0.059 -0.031,0.094 0.001,0.051 0.027,0.086 0.031,0.1249 0.01,0.099 -0.044,0.12 -0.063,0.188 -0.009,0.032 0.008,0.068 0,0.094 -0.016,0.05 -0.093,0.098 -0.094,0.156 -10e-4,0.042 0.059,0.097 0.063,0.1559 0.002,0.04 -0.038,0.057 -0.031,0.094 0.014,0.073 0.16198,0.162 0.21897,0.2189 0.075,0.075 0.15498,0.139 0.18798,0.219 0.027,0.067 0.041,0.1678 0.094,0.2188 0.039,0.037 0.10598,0.054 0.15598,0.094 0.047,0.036 0.10698,0.055 0.15598,0.094 0.081,0.064 0.18297,0.1969 0.31296,0.1879 0.068,-0.01 0.14198,-0.05 0.21897,-0.063 0.079,-0.014 0.16998,-0.039 0.24997,-0.031 0.061,0.01 0.12398,0.066 0.18797,0.063 0.067,0 0.14299,-0.061 0.21898,-0.094 0.13198,-0.057 0.33896,-0.1529 0.53093,-0.1249 0.14598,0.021 0.14898,0.2169 0.24997,0.2809 0.11798,0.01 0.21897,-0.054 0.31296,-0.031 0.07,0.017 0.14898,0.1319 0.15598,0.1879 0.007,0.058 -0.054,0.121 -0.063,0.1559 -0.018,0.078 -0.017,0.169 -0.031,0.2189 -0.011,0.038 -0.032,0.086 -0.031,0.125 0,0.035 0.058,0.1419 0.094,0.1879 0.044,0.056 0.10299,0.096 0.15598,0.1559 0.087,0.109 0.15498,0.2359 0.21897,0.3749 0.017,0.037 -0.016,0.077 0,0.1249 -0.029,0.2239 -0.10298,0.3769 -0.24997,0.6247 -0.069,0.08 -0.15798,0.15 -0.15598,0.2499 -0.005,0.2399 0.13599,0.3928 0.12499,0.6247 -0.024,0.3118 0.024,0.3328 0,0.4997 0.10499,0.053 0.031,0.2329 0,0.3439 -0.045,0.1319 -0.1,0.1619 -0.12499,0.2499 0.071,0.031 0.17098,0.019 0.24997,0 0,0 0.096,0.4008 0.094,0.4058 -0.8069,0.7967 -1.81877,1.3874 -2.93763,1.7182 -0.54993,0.1329 -0.71291,0.1329 -0.96888,0.1879 -0.33395,0.055 -0.68291,0.094 -1.03087,0.094 -0.24296,0 -0.48293,-0.01 -0.71891,-0.031 -0.18197,-0.018 -0.35395,-0.062 -0.53093,-0.094 -0.053,-0.01 -0.10398,-0.02 -0.15598,-0.031 -0.16298,-0.055 -0.35095,-0.088 -0.49994,-0.1249 -0.16997,-0.048 -0.33495,-0.096 -0.49993,-0.156 0.014,-0.013 0.027,-0.011 0.031,-0.031 0.009,-0.04 0.002,-0.062 0,-0.1249 0.015,-0.065 0.08,-0.058 0.094,-0.1249 -0.028,-0.048 -0.083,-0.038 -0.12498,-0.063 -0.041,-0.024 -0.068,-0.074 -0.063,-0.125 0.07,-0.029 0.19997,0.066 0.24996,-0.031 0.025,-0.046 -0.034,-0.1409 0,-0.1879 0.023,-0.031 0.16898,-0.055 0.21898,-0.063 0.071,-0.012 0.14798,-0.01 0.18797,-0.031 0.044,-0.029 0.10099,-0.105 0.094,-0.188 -0.004,-0.039 -0.033,-0.059 -0.063,-0.094 -0.025,-0.029 -0.013,-0.066 -0.031,-0.094 -0.031,-0.047 -0.08,-0.058 -0.094,-0.1249 0.096,-0.019 0.23597,0.1019 0.37496,0.063 0.066,-0.019 0.15698,-0.188 0.18797,-0.2499 0.01,-0.019 -0.01,-0.04 0,-0.063 0.012,-0.026 0.059,-0.049 0.063,-0.063 0.01,-0.036 -0.008,-0.071 0,-0.094 0.024,-0.068 0.085,-0.075 0.12498,-0.125 0.03,-0.038 0.065,-0.087 0.094,-0.1249 0.031,-0.041 0.042,-0.089 0.063,-0.125 0.02,-0.1219 -0.06,-0.2059 -0.031,-0.3128 0.032,-0.12 0.19598,-0.165 0.31296,-0.2189 0.04,-0.019 0.092,-0.05 0.12499,-0.063 0.08,-0.028 0.17598,-0.036 0.24997,-0.063 0.12498,-0.046 0.15698,-0.1669 0.21897,-0.2809 0.029,-0.054 0.057,-0.1179 0.063,-0.1559 0.005,-0.035 -0.007,-0.053 0,-0.094 0.006,-0.04 0.02,-0.081 0.031,-0.1248 0.014,-0.058 0.031,-0.1539 0.031,-0.2189 0,-0.053 -0.029,-0.078 -0.031,-0.1249 -0.009,-0.173 0.061,-0.218 0.12498,-0.3129 0.032,-0.047 0.04,-0.091 0.063,-0.125 0.10799,-0.1609 0.29497,-0.2259 0.28097,-0.4688 -0.005,-0.08 -0.035,-0.2558 -0.094,-0.2808 -0.034,-0.015 -0.10699,-0.011 -0.15598,-0.031 -0.15798,-0.059 -0.27397,-0.2689 -0.43795,-0.2809 -0.035,0 -0.055,0.031 -0.094,0.031 -0.065,0 -0.14698,-0.053 -0.21897,-0.063 -0.046,-0.01 -0.12898,0.013 -0.15598,0 -0.042,-0.02 -0.029,-0.1019 -0.063,-0.1249 -0.027,-0.018 -0.084,-0.015 -0.12498,-0.031 -0.066,-0.025 -0.11199,-0.056 -0.18798,-0.063 -0.023,-0.001 -0.067,0 -0.094,0 -0.042,-0.01 -0.086,-0.04 -0.12498,-0.063 -0.048,-0.029 -0.074,-0.052 -0.094,-0.094 0.044,-0.1439 -0.096,-0.1669 -0.12498,-0.2499 -0.014,-0.039 0.013,-0.09 0,-0.1249 -0.017,-0.05 -0.071,-0.084 -0.12499,-0.125 -0.097,-0.074 -0.17398,-0.1389 -0.31296,-0.1559 -0.061,-0.01 -0.14498,0 -0.21897,0 -0.078,-0.01 -0.16098,-0.058 -0.21897,-0.125 -0.056,-0.065 -0.076,-0.1249 -0.12499,-0.1559 -0.047,-0.03 -0.12398,-0.031 -0.15598,-0.063 -0.014,-0.014 -0.017,-0.031 -0.031,-0.063 -0.023,-0.048 -0.061,-0.098 -0.031,-0.156 -0.053,-0.027 -0.035,0.072 -0.094,0.063 -0.052,-0.074 -0.10099,-0.115 -0.21897,-0.094 -0.054,0.01 -0.093,0.06 -0.15598,0.063 -0.052,0 -0.088,-0.053 -0.15598,-0.063 -0.052,-0.01 -0.11999,0.036 -0.15598,0.031 -0.057,-0.011 -0.073,-0.059 -0.12499,-0.094 -0.038,-0.025 -0.10398,-0.095 -0.12498,-0.094 -0.067,0 -0.12598,0.1429 -0.21897,0.094 -0.045,-0.057 0.085,-0.071 0.031,-0.125 -0.04,-0.041 -0.061,0.01 -0.094,0.031 -0.037,0.025 -0.084,0.047 -0.12499,0.063 -0.092,0.034 -0.14698,0.025 -0.21897,0.063 -0.066,0.034 -0.087,0.088 -0.12499,0.156 -0.031,0.056 -0.079,0.1529 -0.12498,0.1559 -0.056,0 -0.10599,-0.072 -0.15598,-0.094 -0.15298,-0.066 -0.24797,0.03 -0.37495,0.031 -0.11799,0 -0.28697,-0.1709 -0.28097,-0.2808 0.004,-0.067 0.054,-0.166 0.063,-0.2499 0.006,-0.066 0.062,-0.127 0.063,-0.1879 0.001,-0.081 -0.13499,-0.147 -0.18798,-0.156 -0.12498,-0.023 -0.29496,0.061 -0.43794,0 -0.027,-0.045 0.047,-0.081 0.063,-0.1249 0.009,-0.025 -0.009,-0.034 0,-0.063 0.016,-0.042 0.074,-0.08 0.094,-0.1249 0.015,-0.034 0.016,-0.082 0.031,-0.125 0.017,-0.049 0.059,-0.091 0.063,-0.1249 0.005,-0.045 -0.027,-0.095 -0.063,-0.125 -0.11098,0.01 -0.18697,0 -0.24997,0.031 -0.14398,0.066 -0.10598,0.2659 -0.24997,0.3129 -0.05,0.016 -0.13298,0.021 -0.18797,0.031 -0.047,0.01 -0.10699,0.032 -0.15598,0.031 -0.058,-0.001 -0.15298,-0.057 -0.18798,-0.094 -0.009,-0.01 -0.024,-0.036 -0.031,-0.063 0.002,-0.01 -0.002,-0.021 0,-0.031 0.046,-0.2229 0.093,-0.4438 0.15598,-0.6557 0.003,-0.01 -0.003,-0.022 0,-0.031 0.042,-0.1389 0.10298,-0.2699 0.15598,-0.4058 0.013,-0.01 0.019,-0.023 0.031,-0.031 0.077,-0.053 0.15598,-0.1189 0.24997,-0.1249 0.057,0 0.16398,0.02 0.21897,0.031 0.05,0.01 0.082,0.059 0.12499,0.063 0.12298,0.01 0.14898,-0.1029 0.24997,-0.1559 0.10398,0.015 0.15598,-0.01 0.24996,0 0.064,0.01 0.13799,0.09 0.18798,0.094 0.042,0 0.053,-0.069 0.094,-0.063 0.04,0.01 0.11898,0.1079 0.12498,0.1559 0.007,0.06 -0.048,0.122 -0.031,0.1879 0.063,0.064 0.19097,0.056 0.28096,0.094 0.059,-0.048 0.009,-0.118 0,-0.1879 -0.002,-0.031 0.004,-0.066 0,-0.094 -0.006,-0.048 -0.031,-0.084 -0.031,-0.1249 -0.001,-0.1899 0.15398,-0.2999 0.28096,-0.3749 0.055,-0.033 0.10799,-0.069 0.15598,-0.094 0.067,-0.034 0.1,-0.063 0.15598,-0.094 0.10099,-0.057 0.20198,-0.092 0.28097,-0.1559 0.037,-0.086 -0.004,-0.1959 0,-0.2809 0.037,-0.022 0.055,0 0.094,0 0.061,-0.013 0.09,-0.091 0.12499,-0.1249 0.02,-0.02 0.069,-0.043 0.094,-0.063 0.061,-0.048 0.072,-0.104 0.12498,-0.125 0.019,-0.01 0.064,-0.017 0.094,-0.031 0.04,-0.011 0.092,-0.04 0.15598,-0.063 0.042,-0.014 0.13998,-0.015 0.15598,-0.031 0.02,-0.02 -0.006,-0.095 0,-0.1249 0.032,-0.151 0.27196,-0.168 0.40595,-0.2189 0.094,-0.036 0.17798,-0.114 0.28096,-0.094 -0.02,0.072 -0.10998,0.038 -0.094,0.1249 0.023,0.121 0.17598,-0.013 0.21898,-0.031 0.081,-0.034 0.23697,-0.055 0.34395,-0.094 0.094,-0.034 0.24497,-0.08 0.15598,-0.1879 -0.074,0 -0.092,0.066 -0.15598,0.094 -0.044,0.01 -0.056,-0.027 -0.094,-0.031 -0.036,0 -0.057,0.038 -0.094,0.031 -0.037,-0.01 -0.088,-0.082 -0.094,-0.1249 -0.015,-0.111 0.10999,-0.136 0.15598,-0.2189 -0.03,-0.101 -0.16598,-0.024 -0.24997,-0.063 0.009,-0.06 0.055,-0.1139 0.12499,-0.1249 0.057,-0.01 0.18497,0.01 0.21897,0.031 0.02,0.017 0,0.066 0.031,0.094 0.034,0.031 0.081,0.01 0.12499,0 0.016,-0.076 -0.10599,-0.043 -0.094,-0.094 0.09,-0.059 0.26497,-0.016 0.37495,-0.031 0.063,-0.01 0.13099,-0.062 0.18798,-0.094 0.054,-0.03 0.099,-0.081 0.15598,-0.031 0.016,0.054 -0.032,0.066 -0.063,0.094 -0.10199,0.091 -0.20198,0.2069 -0.28097,0.3128 0.049,0.048 0.13599,0.022 0.21898,0.031 0.032,0 0.06,0.025 0.094,0.031 0.04,0.01 0.094,-0.012 0.12499,0 0.056,0.014 0.07,0.094 0.12498,0.094 0.091,0 0.083,-0.125 0.031,-0.1879 0.016,-0.063 0.053,-0.08 0.031,-0.125 -0.041,-0.082 -0.21097,0.014 -0.21897,-0.094 -0.005,-0.067 0.07,-0.075 0.094,-0.125 -0.011,-0.1289 0.10598,-0.1349 0.094,-0.2499 -0.006,-0.048 -0.06,-0.049 -0.094,-0.094 -0.017,-0.023 -0.01,-0.076 -0.031,-0.094 -0.07,-0.059 -0.20997,-0.044 -0.21897,-0.1559 -0.004,-0.066 0.01,-0.115 0,-0.1879 -0.009,-0.067 -0.066,-0.2679 -0.12498,-0.2809 -0.075,-0.016 -0.12899,0.1139 -0.21898,0.1559 -0.049,0.023 -0.13898,0.04 -0.18797,0.031 -0.032,-0.01 -0.089,-0.032 -0.094,-0.094 -0.006,-0.07 0.05,-0.082 0.063,-0.1558 -0.011,-0.044 -0.051,-0.029 -0.094,-0.063 -0.049,-0.037 -0.091,-0.1159 -0.15598,-0.1249 -0.033,0 -0.093,0.029 -0.12498,0.031 -0.06,0 -0.10599,-0.015 -0.15598,-0.031 0.021,-0.01 0.041,-0.024 0.063,-0.031 0.12198,-0.042 0.24997,-0.059 0.37495,-0.094 0.022,-0.01 0.041,-0.025 0.063,-0.031 0.031,0.033 0.056,0.1029 0.094,0.1249 0.025,0.014 0.063,-0.01 0.094,0 0.098,0.03 0.17398,0.085 0.28097,0.063 0.037,-0.065 -0.074,-0.074 -0.031,-0.125 0.072,0.01 0.13198,0.04 0.18798,0.063 0.077,-0.056 0.12798,-0.066 0.12498,-0.1559 -10e-4,-0.046 -0.062,-0.063 -0.094,-0.094 0.063,-0.011 0.12399,-0.022 0.18798,-0.031 0.005,0.017 0.021,0.03 0.031,0.031 0.038,0.01 0.16498,-0.051 0.18797,-0.063 0.004,0 -0.006,-0.027 0,-0.031 0.25297,-0.027 0.52094,-0.031 0.7809,-0.031 m -2.49968,0.4688 c -0.023,0.043 -0.047,0.079 -0.094,0.094 0.012,0.065 -0.084,0.1049 -0.094,0.1558 -0.006,0.035 -0.002,0.094 0,0.125 0.02,0.3189 -0.25096,0.4768 -0.56293,0.4688 -0.061,0.058 -0.029,0.1699 -0.063,0.2499 -0.028,0.067 -0.11998,0.1309 -0.18797,0.1249 -0.05,0 -0.12499,-0.079 -0.12499,-0.1249 0,-0.057 0.081,-0.091 0.031,-0.156 0.007,-0.044 0.10598,-0.086 0.094,-0.1559 -0.012,-0.074 -0.096,-0.019 -0.18798,-0.031 -0.052,-0.01 -0.13298,-0.037 -0.18798,-0.063 0.10099,-0.067 0.20498,-0.126 0.31296,-0.188 0.094,-0.056 0.18498,-0.1049 0.28097,-0.1559 0.25197,-0.1269 0.52193,-0.2438 0.7809,-0.3437 m 5.37432,0.7495 c -0.027,0 -0.04,0.018 -0.063,0.031 -0.051,0.031 -0.054,0.079 -0.094,0.094 -0.054,0.021 -0.11698,0.01 -0.12498,0.063 -0.006,0.041 0.033,0.055 0.031,0.094 -0.02,0.049 -0.053,0.066 -0.063,0.1249 0.068,0.11 0.22897,-0.01 0.31296,-0.031 0.038,-0.011 0.073,0 0.094,-0.031 0.023,-0.035 0.013,-0.105 0.031,-0.156 0.019,-0.056 0.069,-0.043 0.063,-0.094 -0.006,-0.05 -0.10599,-0.102 -0.18797,-0.094 m -7.31208,0.7807 c 0.061,0.016 0.19597,0.1929 0.063,0.2499 -0.013,0.01 -0.18698,0.036 -0.21897,0.031 -0.046,-0.01 -0.078,-0.086 -0.12499,-0.094 -0.092,-0.016 -0.21797,0.101 -0.28096,0 0.016,-0.059 0.086,-0.043 0.15598,-0.063 0.12498,-0.034 0.29796,-0.1529 0.40595,-0.1249 m 0.24996,0.3128 c 0.031,0 0.056,0.059 0.094,0.063 0.036,0 0.072,-0.036 0.094,-0.031 0.056,0.015 0.084,0.115 0.031,0.156 -0.044,0 -0.061,-0.037 -0.094,-0.031 -0.091,0.016 -0.11999,0.1929 -0.18798,0.1879 -0.064,-0.01 -0.096,-0.1409 -0.031,-0.1879 0.002,-0.04 -0.033,-0.054 -0.031,-0.094 0.02,-0.025 0.072,-0.066 0.12498,-0.063 m -0.31296,0.031 c 0.019,0.001 0.024,0 0.031,0 -0.009,0.071 -0.039,0.091 -0.094,0.125 -0.095,0.057 -0.15698,0.1279 -0.18797,0.2499 -0.009,0.036 -0.11099,0.1339 -0.15598,0.1249 -0.10599,-0.022 0.038,-0.2199 0.063,-0.2499 0.027,-0.033 0.062,-0.056 0.094,-0.094 0.03,-0.037 0.033,-0.105 0.063,-0.125 0.032,-0.022 0.13198,-0.033 0.18797,-0.031 m 9.49881,0.031 c 0.048,0.013 0.058,0.069 0.094,0.094 0.027,0.018 0.064,0.012 0.094,0.031 0.035,0.022 0.054,0.06 0.094,0.094 0.056,0.047 0.13998,0.088 0.21897,0.125 0.016,0.01 0.044,0.023 0.063,0.031 0.055,0.071 0.10399,0.1449 0.15598,0.2189 0.006,0.04 0.012,0.099 0.031,0.1249 0.052,0.071 0.13098,0.1319 0.18798,0.2189 -10e-4,0.083 0.036,0.133 0.094,0.1559 0.073,0.124 0.14898,0.2479 0.21897,0.3748 0.029,0.058 0.035,0.1289 0.063,0.1879 -0.021,0 -0.043,0.01 -0.063,0 -0.066,-0.116 -0.40895,-0.1389 -0.43795,0.031 -0.013,0.075 0.049,0.1749 -0.063,0.1879 -0.071,0.01 -0.15298,-0.073 -0.24997,-0.094 -0.04,-0.01 -0.094,0.014 -0.12498,0 -0.073,-0.025 -0.062,-0.1119 -0.12498,-0.1559 -0.036,-0.025 -0.12999,-0.056 -0.18798,-0.063 -0.036,0 -0.056,0 -0.094,0 -0.045,-0.01 -0.11798,-0.01 -0.15598,-0.031 -0.036,-0.022 -0.11599,-0.062 -0.12498,-0.094 -0.014,-0.049 0.09,-0.1139 0.094,-0.1558 0.002,-0.031 -0.023,-0.045 -0.031,-0.094 -0.005,-0.029 0.006,-0.074 0,-0.094 -0.01,-0.034 -0.071,-0.062 -0.12499,-0.063 -0.048,0 -0.084,0.03 -0.12498,0.031 -0.059,0.001 -0.17698,-0.037 -0.24997,-0.031 -0.044,0 -0.084,0.028 -0.12499,0.031 -0.11598,0.01 -0.19097,-0.01 -0.28096,0 -0.066,0 -0.18898,0.034 -0.24997,0.063 -0.031,0.014 -0.054,0.043 -0.094,0.063 -0.018,0.01 -0.039,0.021 -0.063,0.031 -0.038,0.017 -0.089,0.053 -0.12498,0.063 -0.052,0.013 -0.12399,0 -0.21898,0 -0.068,0 -0.18697,-0.014 -0.18797,-0.094 -10e-4,-0.1229 0.22697,-0.072 0.34396,-0.094 0.044,-0.01 0.073,-0.063 0.12498,-0.094 0.025,-0.015 0.039,-0.015 0.063,-0.031 0.04,-0.028 0.11898,-0.093 0.12498,-0.1249 0.006,-0.03 -0.035,-0.072 -0.031,-0.094 0.005,-0.028 0.057,-0.058 0.094,-0.094 0.056,-0.055 0.087,-0.1199 0.15598,-0.1559 0.047,-0.025 0.13499,-0.024 0.15599,-0.063 0.005,-0.043 -0.001,-0.055 0,-0.094 0.029,-0.027 0.038,-0.058 0.063,-0.063 0.072,-0.016 0.13498,0.035 0.21897,0.031 0.036,0 0.086,-0.01 0.12498,-0.031 0.033,-0.022 0.062,-0.045 0.094,-0.063 0.035,-0.018 0.051,-0.059 0.094,-0.063 0.10499,-0.01 0.17098,0.1239 0.21897,0.1879 0.04,0.053 0.15299,0.1189 0.21898,0.1559 0.037,0.021 0.084,0.045 0.12498,0.063 0.087,0.039 0.24697,0.1649 0.24997,0.2499 0.002,0.042 -0.038,0.054 -0.031,0.094 0.066,0.011 0.12298,-0.059 0.12498,-0.1249 0.001,-0.041 -0.039,-0.05 -0.031,-0.094 0.031,-0.066 0.14798,-0.01 0.18798,-0.031 -0.007,-0.075 -0.12398,-0.086 -0.18798,-0.1249 -0.034,-0.021 -0.058,-0.048 -0.094,-0.063 -0.052,-0.021 -0.11598,-0.032 -0.15598,-0.063 -0.038,-0.029 -0.057,-0.08 -0.094,-0.1249 -0.054,-0.064 -0.15798,-0.073 -0.12498,-0.2189 0.016,-0.022 0.037,-0.069 0.063,-0.063 m -8.81189,0.2189 0.094,0 c 0.034,10e-4 0.08,-0.018 0.094,0 -0.022,0.088 -0.21197,0.063 -0.28096,0.031 0.004,-0.033 0.05,-0.027 0.094,-0.031 m -0.31296,0.156 c 0.023,0 0.039,-0.01 0.063,0 -0.062,0.052 -0.14398,0.092 -0.24997,0.1249 -0.051,0.016 -0.11598,0.025 -0.12498,-0.031 -0.011,-0.069 0.047,-0.056 0.094,-0.063 0.058,-0.01 0.14999,-0.029 0.21898,-0.031 m 8.6869,0 c -0.043,0.014 -0.066,0.1129 0,0.1249 0.031,-0.018 0.039,-0.068 0.031,-0.1249 -0.017,-0.018 -0.017,0 -0.031,0 m -0.031,0.1879 c -0.021,0.01 -0.04,0.01 -0.063,0.031 10e-4,0.075 0.015,0.1229 0,0.1879 0.043,0.082 0.13398,0.026 0.15598,-0.031 0.026,-0.1389 -0.03,-0.2049 -0.094,-0.1879 m 0.43795,0.3748 c 0.049,0.08 0.14098,0.137 0.24997,0.1559 0.04,-0.03 0.044,-0.1049 0.063,-0.1559 -0.047,10e-4 -0.097,0 -0.15598,0 -0.059,0 -0.12198,-0.028 -0.15598,0 m -11.68652,2.6867 c 0.16398,-0.01 0.21197,0.2159 0.34395,0.2809 0.033,0.017 0.082,0.022 0.12499,0.031 0.035,0.01 0.061,0.02 0.094,0.031 0.071,0.024 0.16198,0.01 0.21897,0.031 0.085,0.038 0.14598,0.2069 0.21897,0.2499 0.004,0.043 -0.013,0.093 0,0.1249 0.035,0.047 0.099,0.064 0.15598,0.094 0.068,0.037 0.092,0.1269 0.15598,0.1559 0.022,0.01 0.059,-0.01 0.094,0 0.088,0.027 0.11199,0.1468 0.18798,0.1248 0.05,-0.014 0.055,-0.078 0.063,-0.1248 0.033,-0.036 0.074,-0.093 0.12498,-0.094 0.083,0 0.095,0.075 0.12499,0.1559 0.017,0.046 0.051,0.1079 0.063,0.1559 0.021,0.083 0.017,0.3249 0,0.3748 -0.021,0.061 -0.10599,0.089 -0.15598,0.156 -0.024,0.031 -0.044,0.071 -0.063,0.094 -0.032,0.04 -0.069,0.057 -0.094,0.094 -0.014,0.021 -0.018,0.066 -0.031,0.094 -0.04,0.085 -0.096,0.148 -0.063,0.2499 0.014,0.042 0.062,0.076 0.063,0.125 0,0.058 -0.11498,0.093 -0.12498,0.1559 -0.007,0.047 0.048,0.126 0.063,0.1879 0.011,0.047 0.097,0.094 0.12498,0.125 0.047,0.053 0.082,0.1209 0.12499,0.1879 0.085,0.1299 0.13598,0.2799 0.21897,0.4058 0.043,0.066 0.12698,0.119 0.15598,0.1879 0.015,0.035 -0.014,0.094 0,0.125 0.048,0.1079 0.26597,0.2279 0.37495,0.2809 0.051,0.025 0.10999,0 0.15598,0.031 0.071,0.039 0.21398,0.1569 0.24997,0.2189 0.032,0.056 0.047,0.1929 0.063,0.2808 0.021,0.117 -0.005,0.2169 0,0.3439 0.004,0.069 0.03,0.1189 0.031,0.1879 0,0.024 10e-4,0.07 0,0.094 -0.002,0.083 0.007,0.1659 0,0.2498 -0.004,0.046 -0.003,0.087 0,0.125 0.004,0.041 0.028,0.057 0.031,0.094 0.002,0.039 -0.035,0.095 -0.031,0.125 0.009,0.084 0.077,0.1419 0.094,0.2189 0.013,0.061 0.039,0.2079 0.031,0.2809 -0.005,0.039 -0.025,0.083 -0.031,0.1249 -0.004,0.033 0.005,0.062 0,0.094 -0.006,0.047 -0.034,0.081 -0.031,0.1249 0.006,0.09 0.08,0.16 0.094,0.2499 0.005,0.03 -10e-4,0.065 0,0.094 0.001,0.027 0.023,0.038 0.031,0.063 -0.26297,-0.1499 -0.50894,-0.3178 -0.74991,-0.4997 -0.22897,-0.173 -0.45094,-0.3639 -0.65592,-0.5628 -0.01,-0.01 -0.021,-0.021 -0.031,-0.031 -0.20698,-0.2039 -0.41395,-0.4278 -0.59393,-0.6557 -0.10398,-0.1319 -0.21797,-0.2669 -0.31296,-0.4058 -0.056,-0.083 -0.10399,-0.1639 -0.15598,-0.2499 -0.032,-0.051 -0.063,-0.104 -0.094,-0.1559 -0.089,-0.153 -0.17297,-0.3078 -0.24997,-0.4687 -0.049,-0.101 -0.081,-0.2079 -0.12498,-0.3129 -0.10499,-0.2479 -0.20497,-0.4888 -0.28096,-0.7497 -0.054,-0.1849 -0.086,-0.3708 -0.12499,-0.5627 -0.03,-0.146 -0.073,-0.2889 -0.094,-0.4378 -0.011,-0.081 -0.023,-0.168 -0.031,-0.2499 -0.024,-0.2349 -0.031,-0.4768 -0.031,-0.7186 0,-0.3019 0.026,-0.5837 0.063,-0.8746 10e-4,-0.01 -10e-4,-0.021 0,-0.031 0.063,0 0.14899,-0.092 0.21898,-0.094 m 2.68766,0.7497 c 0.064,-0.029 0.084,0.117 0.031,0.125 -0.05,0.01 -0.08,-0.102 -0.031,-0.125"
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#4d4d4d;fill-opacity:1" />
+    <rect
+       style="fill:#16907d;fill-opacity:1;stroke:none"
+       id="rect4035-8"
+       width="0"
+       height="10.999983"
+       x="293.00085"
+       y="543.62817" />
+    <rect
+       style="fill:#6c7a89;fill-opacity:1;stroke:none"
+       id="rect4035-0"
+       width="0"
+       height="10.999983"
+       x="294.37088"
+       y="542.8327" />
+  </g>
+</svg>
diff --git a/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/24/kexiform-web-browser.svg b/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/24/kexiform-web-browser.svg
new file mode 100644
index 000000000..42b894ef0
--- /dev/null
+++ b/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/actions/24/kexiform-web-browser.svg
@@ -0,0 +1,125 @@
+<?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="24"
+   height="24"
+   id="svg3869"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="kreport-web-element.svg">
+  <defs
+     id="defs3871" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627416"
+     inkscape:cx="0.24510105"
+     inkscape:cy="12.779481"
+     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="1280"
+     inkscape:window-height="942"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4132" />
+    <sodipodi:guide
+       position="2,20.000017"
+       orientation="18,0"
+       id="guide4138" />
+    <sodipodi:guide
+       position="2,2.0000174"
+       orientation="0,18"
+       id="guide4140" />
+    <sodipodi:guide
+       position="20,2.0000174"
+       orientation="-18,0"
+       id="guide4142" />
+    <sodipodi:guide
+       position="20,20.000017"
+       orientation="0,-18"
+       id="guide4144" />
+    <sodipodi:guide
+       position="3,19.000017"
+       orientation="16,0"
+       id="guide4146" />
+    <sodipodi:guide
+       position="3,3.0000174"
+       orientation="0,16"
+       id="guide4148" />
+    <sodipodi:guide
+       position="19,3.0000174"
+       orientation="-16,0"
+       id="guide4150" />
+    <sodipodi:guide
+       position="19,19.000017"
+       orientation="0,-16"
+       id="guide4152" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3874">
+    <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(-326,-532.3622)">
+    <rect
+       style="fill:#04896a;fill-opacity:1;stroke:none"
+       id="rect4035"
+       width="0"
+       height="10.999983"
+       x="287.74176"
+       y="526.70184" />
+    <path
+       id="path3011"
+       d="m 338.00405,536.3622 c -0.31896,0 -0.62792,0.026 -0.93788,0.063 -0.30396,0.036 -0.61392,0.087 -0.90589,0.1559 -0.094,0.022 -0.18497,0.067 -0.28096,0.094 -0.084,0.023 -0.16698,0.037 -0.24997,0.063 -0.10499,0.033 -0.21397,0.059 -0.31296,0.094 -0.10699,0.038 -0.20697,0.083 -0.31296,0.1249 -0.20597,0.083 -0.39695,0.182 -0.59393,0.2809 -0.071,0.036 -0.14898,0.056 -0.21897,0.094 -0.22997,0.1209 -0.44094,0.2629 -0.65592,0.4058 -0.082,0.055 -0.16997,0.098 -0.24996,0.1559 -0.033,0.024 -0.061,0.038 -0.094,0.063 -0.094,0.071 -0.19098,0.1418 -0.28097,0.2188 -0.10698,0.089 -0.20997,0.1869 -0.31296,0.2809 -0.032,0.03 -0.062,0.064 -0.094,0.094 -0.011,0.011 -0.02,0.02 -0.031,0.031 -0.016,0.016 -0.015,0.047 -0.031,0.063 -0.20997,0.2039 -0.43894,0.3988 -0.62492,0.6247 -0.005,0.01 0.005,0.025 0,0.031 -0.18098,0.2199 -0.34296,0.4478 -0.49994,0.6877 -0.021,0.032 -0.042,0.061 -0.063,0.094 -0.015,0.024 -0.047,0.037 -0.063,0.063 -0.06,0.098 -0.10099,0.209 -0.15598,0.3129 -0.018,0.033 -0.045,0.061 -0.063,0.094 -0.075,0.1459 -0.14998,0.2898 -0.21897,0.4378 -0.004,0.01 0.004,0.023 0,0.031 -0.11699,0.2528 -0.22198,0.5136 -0.31296,0.7805 -0.019,0.053 -0.045,0.103 -0.063,0.156 -0.003,0.01 0.003,0.022 0,0.031 -0.02,0.062 -0.044,0.125 -0.063,0.188 -0.073,0.2568 -0.13998,0.5137 -0.18798,0.7806 -0.034,0.1919 -0.074,0.3968 -0.094,0.5938 -0.027,0.2648 -0.031,0.5417 -0.031,0.8125 0,0.4038 0.036,0.7996 0.094,1.1875 0.006,0.041 -0.007,0.085 0,0.1249 0.044,0.2659 0.11798,0.5248 0.18798,0.7807 0.026,0.096 0.064,0.1859 0.094,0.2809 0.04,0.1289 0.079,0.2489 0.12499,0.3748 0.077,0.2119 0.15598,0.4218 0.24997,0.6246 0.05,0.106 0.10198,0.2099 0.15598,0.3129 0.15198,0.2919 0.31496,0.5747 0.49993,0.8436 0.016,0.024 0.046,0.039 0.063,0.063 0.19797,0.2809 0.39395,0.5597 0.62492,0.8126 0.04,0.044 0.084,0.082 0.12498,0.125 0.04,0.042 0.084,0.084 0.12499,0.1249 0.21397,0.2139 0.45094,0.4048 0.68791,0.5938 0.30596,0.2438 0.62892,0.4587 0.96888,0.6556 0.012,0.01 0.019,0.024 0.031,0.031 0.053,0.03 0.10299,0.065 0.15598,0.094 0.31596,0.156 0.69192,0.3249 0.93788,0.4378 0.10999,0.042 0.23098,0.057 0.34396,0.094 0.053,0.018 0.10299,0.046 0.15598,0.063 0.13598,0.041 0.26797,0.09 0.40595,0.1249 0.042,0.011 0.083,0.021 0.12499,0.031 0.29196,0.069 0.60192,0.1209 0.90588,0.1559 0.30896,0.036 0.61792,0.063 0.93788,0.063 0.33996,0 0.67092,-0.021 0.99988,-0.063 0.36495,-0.048 0.68091,-0.1239 0.99987,-0.1879 1.69779,-0.4358 3.1616,-1.4213 4.21847,-2.7487 0.028,-0.035 0.067,-0.058 0.094,-0.094 0.009,-0.012 0.022,-0.02 0.031,-0.031 0.014,-0.018 0.018,-0.044 0.031,-0.063 0.62292,-0.8246 1.07686,-1.7801 1.34383,-2.8117 0.056,-0.2169 0.11799,-0.4318 0.15598,-0.6557 0.005,-0.03 -0.005,-0.063 0,-0.094 0.006,-0.04 0.025,-0.079 0.031,-0.125 0.006,-0.043 0.026,-0.082 0.031,-0.1249 l -0.031,0 c 0.044,-0.3289 0.094,-0.6587 0.094,-0.9996 0,-0.5517 -0.05,-1.1034 -0.15598,-1.6242 -0.009,-0.043 -0.022,-0.082 -0.031,-0.1249 -0.046,-0.2079 -0.12398,-0.4229 -0.18798,-0.6248 -0.003,-0.01 0.003,-0.022 0,-0.031 -0.012,-0.038 -0.018,-0.056 -0.031,-0.094 -0.039,-0.119 -0.081,-0.2579 -0.12498,-0.3748 -0.012,-0.032 -0.018,-0.064 -0.031,-0.094 -0.043,-0.109 -0.10799,-0.2059 -0.15598,-0.3128 -0.002,0 0.002,-0.026 0,-0.031 -0.025,-0.054 -0.068,-0.1029 -0.094,-0.1559 -0.098,-0.2029 -0.19797,-0.3998 -0.31296,-0.5937 -0.058,-0.098 -0.094,-0.2169 -0.15598,-0.3129 -0.024,-0.036 -0.069,-0.058 -0.094,-0.094 -0.067,-0.099 -0.14698,-0.185 -0.21897,-0.2809 -0.08,-0.1 -0.13999,-0.2159 -0.21898,-0.3129 -0.005,-0.01 0.005,-0.025 0,-0.031 -0.17197,-0.2089 -0.36995,-0.4028 -0.56292,-0.5937 -0.093,-0.092 -0.18398,-0.1939 -0.28097,-0.2809 -0.028,-0.025 -0.065,-0.038 -0.094,-0.063 -0.20897,-0.1819 -0.42994,-0.3398 -0.65592,-0.4996 -0.055,-0.038 -0.10098,-0.088 -0.15598,-0.125 -0.07,-0.046 -0.14798,-0.081 -0.21897,-0.1249 -0.13498,-0.084 -0.26597,-0.174 -0.40595,-0.2499 -0.12298,-0.067 -0.24797,-0.127 -0.37495,-0.1879 -0.21397,-0.102 -0.43195,-0.198 -0.65592,-0.2809 -0.26596,-0.099 -0.53393,-0.1799 -0.8129,-0.2499 -0.24496,-0.062 -0.49693,-0.118 -0.7499,-0.1559 -0.39695,-0.061 -0.8049,-0.094 -1.21885,-0.094 m 0,0.9996 c 0.29896,0 0.58493,0.027 0.87489,0.063 0.17998,0.023 0.35496,0.058 0.53093,0.094 0.01,0 0.021,0 0.031,0 0.16598,0.035 0.33796,0.079 0.49994,0.1249 0.096,0.027 0.18698,0.063 0.28097,0.094 0.17197,0.057 0.33395,0.1169 0.49993,0.1879 0.19398,0.08 0.37896,0.1528 0.56293,0.2498 -0.031,0.01 -0.063,0.021 -0.094,0.031 -0.047,0.017 -0.11298,0.096 -0.12498,0.1249 -0.02,0.048 0.005,0.115 0,0.188 0.038,0.017 0.06,0.089 0.12498,0.1249 0.025,0.014 0.041,-0.01 0.063,0 0.038,0.021 0.07,0.087 0.063,0.1249 -0.011,0.055 -0.088,0.022 -0.12498,0.063 0.006,0.078 -0.043,0.105 -0.063,0.1559 0.012,0.033 0.057,0.024 0.063,0.063 -0.007,0.043 -0.079,0.049 -0.063,0.094 0.072,0.056 0.15098,-0.022 0.21897,-0.031 0.14898,-0.019 0.28297,0.041 0.37495,-0.031 -0.012,-0.071 0.10099,-0.092 0.094,-0.1559 -0.006,-0.048 -0.09,-0.061 -0.12498,-0.094 -0.019,-0.018 -0.04,-0.059 -0.063,-0.094 -0.026,-0.04 -0.064,-0.087 -0.094,-0.125 -0.039,-0.052 -0.12498,-0.1169 -0.12498,-0.1559 0.001,-0.045 0.052,-0.063 0.063,-0.125 -0.012,-0.057 -0.11699,0 -0.12499,-0.063 0.002,-0.019 0.021,-0.051 0.031,-0.063 0.14998,0.082 0.29796,0.1789 0.43795,0.2809 0.032,0.021 0.062,0.041 0.094,0.063 0.10798,0.081 0.20697,0.17 0.31296,0.2499 -0.067,0.012 -0.10099,0.09 -0.15598,0.156 -0.038,0.046 -0.099,0.1009 -0.15598,0.1249 -0.028,0.012 -0.068,-0.016 -0.094,0 -0.037,0.025 -0.051,0.096 -0.094,0.125 -0.031,0.021 -0.12399,0.094 -0.15598,0.094 -0.038,10e-4 -0.098,-0.04 -0.12499,-0.031 -0.04,0.013 -0.017,0.077 -0.063,0.094 -0.088,0.031 -0.24997,-0.069 -0.28096,0.063 0.038,0.076 0.15298,0.051 0.21897,0.094 0.042,0.026 0.11399,0.143 0.12498,0.1879 0.01,0.038 0.015,0.179 0,0.2189 -0.041,0.106 -0.15898,0.097 -0.28096,0.094 -0.034,-10e-4 -0.063,0 -0.094,0 -0.20697,-0.014 -0.40695,-0.085 -0.49994,0.063 0.007,0.1129 0.025,0.1829 0,0.2808 -0.018,0.072 -0.097,0.125 -0.094,0.188 0.002,0.032 0.055,0.082 0.063,0.1249 0.005,0.023 -0.011,0.073 0,0.094 0.034,0.066 0.12699,-0.01 0.18798,0 0.059,0.01 0.12598,0.1209 0.12498,0.1879 -10e-4,0.046 -0.033,0.1119 -0.063,0.1559 -0.058,0.089 -0.16698,0.077 -0.24997,0.1249 -0.07,0.039 -0.084,0.1189 -0.12498,0.1879 -0.044,0.074 -0.081,0.1109 -0.063,0.2189 -0.06,0.1179 -0.12598,0.1939 -0.24997,0.2499 -0.037,0.017 -0.092,0.039 -0.12498,0.063 -0.027,0.019 -0.056,0.051 -0.094,0.094 -0.047,0.052 -0.1,0.085 -0.12499,0.125 -0.019,0.031 -0.01,0.084 -0.031,0.1249 -0.029,0.056 -0.088,0.1 -0.12498,0.1559 -0.017,0.026 -0.043,0.059 -0.063,0.094 -0.042,0.077 -0.10099,0.1509 -0.094,0.2189 0.007,0.066 0.089,0.068 0.094,0.1249 0.004,0.032 -0.033,0.059 -0.031,0.094 0.001,0.051 0.027,0.086 0.031,0.1249 0.01,0.099 -0.044,0.12 -0.063,0.188 -0.009,0.032 0.008,0.068 0,0.094 -0.016,0.05 -0.093,0.098 -0.094,0.156 -10e-4,0.042 0.059,0.097 0.063,0.1559 0.002,0.04 -0.038,0.057 -0.031,0.094 0.014,0.073 0.16198,0.162 0.21897,0.2189 0.075,0.075 0.15498,0.139 0.18798,0.219 0.027,0.067 0.041,0.1678 0.094,0.2188 0.039,0.037 0.10598,0.054 0.15598,0.094 0.047,0.036 0.10698,0.055 0.15598,0.094 0.081,0.064 0.18297,0.1969 0.31296,0.1879 0.068,-0.01 0.14198,-0.05 0.21897,-0.063 0.079,-0.014 0.16998,-0.039 0.24997,-0.031 0.061,0.01 0.12398,0.066 0.18797,0.063 0.067,0 0.14299,-0.061 0.21898,-0.094 0.13198,-0.057 0.33896,-0.1529 0.53093,-0.1249 0.14598,0.021 0.14898,0.2169 0.24997,0.2809 0.11798,0.01 0.21897,-0.054 0.31296,-0.031 0.07,0.017 0.14898,0.1319 0.15598,0.1879 0.007,0.058 -0.054,0.121 -0.063,0.1559 -0.018,0.078 -0.017,0.169 -0.031,0.2189 -0.011,0.038 -0.032,0.086 -0.031,0.125 0,0.035 0.058,0.1419 0.094,0.1879 0.044,0.056 0.10299,0.096 0.15598,0.1559 0.087,0.109 0.15498,0.2359 0.21897,0.3749 0.017,0.037 -0.016,0.077 0,0.1249 -0.029,0.2239 -0.10298,0.3769 -0.24997,0.6247 -0.069,0.08 -0.15798,0.15 -0.15598,0.2499 -0.005,0.2399 0.13599,0.3928 0.12499,0.6247 -0.024,0.3118 0.024,0.3328 0,0.4997 0.10499,0.053 0.031,0.2329 0,0.3439 -0.045,0.1319 -0.1,0.1619 -0.12499,0.2499 0.071,0.031 0.17098,0.019 0.24997,0 0,0 0.096,0.4008 0.094,0.4058 -0.8069,0.7967 -1.81877,1.3874 -2.93763,1.7182 -0.54993,0.1329 -0.71291,0.1329 -0.96888,0.1879 -0.33395,0.055 -0.68291,0.094 -1.03087,0.094 -0.24296,0 -0.48293,-0.01 -0.71891,-0.031 -0.18197,-0.018 -0.35395,-0.062 -0.53093,-0.094 -0.053,-0.01 -0.10398,-0.02 -0.15598,-0.031 -0.16298,-0.055 -0.35095,-0.088 -0.49994,-0.1249 -0.16997,-0.048 -0.33495,-0.096 -0.49993,-0.156 0.014,-0.013 0.027,-0.011 0.031,-0.031 0.009,-0.04 0.002,-0.062 0,-0.1249 0.015,-0.065 0.08,-0.058 0.094,-0.1249 -0.028,-0.048 -0.083,-0.038 -0.12498,-0.063 -0.041,-0.024 -0.068,-0.074 -0.063,-0.125 0.07,-0.029 0.19997,0.066 0.24996,-0.031 0.025,-0.046 -0.034,-0.1409 0,-0.1879 0.023,-0.031 0.16898,-0.055 0.21898,-0.063 0.071,-0.012 0.14798,-0.01 0.18797,-0.031 0.044,-0.029 0.10099,-0.105 0.094,-0.188 -0.004,-0.039 -0.033,-0.059 -0.063,-0.094 -0.025,-0.029 -0.013,-0.066 -0.031,-0.094 -0.031,-0.047 -0.08,-0.058 -0.094,-0.1249 0.096,-0.019 0.23597,0.1019 0.37496,0.063 0.066,-0.019 0.15698,-0.188 0.18797,-0.2499 0.01,-0.019 -0.01,-0.04 0,-0.063 0.012,-0.026 0.059,-0.049 0.063,-0.063 0.01,-0.036 -0.008,-0.071 0,-0.094 0.024,-0.068 0.085,-0.075 0.12498,-0.125 0.03,-0.038 0.065,-0.087 0.094,-0.1249 0.031,-0.041 0.042,-0.089 0.063,-0.125 0.02,-0.1219 -0.06,-0.2059 -0.031,-0.3128 0.032,-0.12 0.19598,-0.165 0.31296,-0.2189 0.04,-0.019 0.092,-0.05 0.12499,-0.063 0.08,-0.028 0.17598,-0.036 0.24997,-0.063 0.12498,-0.046 0.15698,-0.1669 0.21897,-0.2809 0.029,-0.054 0.057,-0.1179 0.063,-0.1559 0.005,-0.035 -0.007,-0.053 0,-0.094 0.006,-0.04 0.02,-0.081 0.031,-0.1248 0.014,-0.058 0.031,-0.1539 0.031,-0.2189 0,-0.053 -0.029,-0.078 -0.031,-0.1249 -0.009,-0.173 0.061,-0.218 0.12498,-0.3129 0.032,-0.047 0.04,-0.091 0.063,-0.125 0.10799,-0.1609 0.29497,-0.2259 0.28097,-0.4688 -0.005,-0.08 -0.035,-0.2558 -0.094,-0.2808 -0.034,-0.015 -0.10699,-0.011 -0.15598,-0.031 -0.15798,-0.059 -0.27397,-0.2689 -0.43795,-0.2809 -0.035,0 -0.055,0.031 -0.094,0.031 -0.065,0 -0.14698,-0.053 -0.21897,-0.063 -0.046,-0.01 -0.12898,0.013 -0.15598,0 -0.042,-0.02 -0.029,-0.1019 -0.063,-0.1249 -0.027,-0.018 -0.084,-0.015 -0.12498,-0.031 -0.066,-0.025 -0.11199,-0.056 -0.18798,-0.063 -0.023,-0.001 -0.067,0 -0.094,0 -0.042,-0.01 -0.086,-0.04 -0.12498,-0.063 -0.048,-0.029 -0.074,-0.052 -0.094,-0.094 0.044,-0.1439 -0.096,-0.1669 -0.12498,-0.2499 -0.014,-0.039 0.013,-0.09 0,-0.1249 -0.017,-0.05 -0.071,-0.084 -0.12499,-0.125 -0.097,-0.074 -0.17398,-0.1389 -0.31296,-0.1559 -0.061,-0.01 -0.14498,0 -0.21897,0 -0.078,-0.01 -0.16098,-0.058 -0.21897,-0.125 -0.056,-0.065 -0.076,-0.1249 -0.12499,-0.1559 -0.047,-0.03 -0.12398,-0.031 -0.15598,-0.063 -0.014,-0.014 -0.017,-0.031 -0.031,-0.063 -0.023,-0.048 -0.061,-0.098 -0.031,-0.156 -0.053,-0.027 -0.035,0.072 -0.094,0.063 -0.052,-0.074 -0.10099,-0.115 -0.21897,-0.094 -0.054,0.01 -0.093,0.06 -0.15598,0.063 -0.052,0 -0.088,-0.053 -0.15598,-0.063 -0.052,-0.01 -0.11999,0.036 -0.15598,0.031 -0.057,-0.011 -0.073,-0.059 -0.12499,-0.094 -0.038,-0.025 -0.10398,-0.095 -0.12498,-0.094 -0.067,0 -0.12598,0.1429 -0.21897,0.094 -0.045,-0.057 0.085,-0.071 0.031,-0.125 -0.04,-0.041 -0.061,0.01 -0.094,0.031 -0.037,0.025 -0.084,0.047 -0.12499,0.063 -0.092,0.034 -0.14698,0.025 -0.21897,0.063 -0.066,0.034 -0.087,0.088 -0.12499,0.156 -0.031,0.056 -0.079,0.1529 -0.12498,0.1559 -0.056,0 -0.10599,-0.072 -0.15598,-0.094 -0.15298,-0.066 -0.24797,0.03 -0.37495,0.031 -0.11799,0 -0.28697,-0.1709 -0.28097,-0.2808 0.004,-0.067 0.054,-0.166 0.063,-0.2499 0.006,-0.066 0.062,-0.127 0.063,-0.1879 0.001,-0.081 -0.13499,-0.147 -0.18798,-0.156 -0.12498,-0.023 -0.29496,0.061 -0.43794,0 -0.027,-0.045 0.047,-0.081 0.063,-0.1249 0.009,-0.025 -0.009,-0.034 0,-0.063 0.016,-0.042 0.074,-0.08 0.094,-0.1249 0.015,-0.034 0.016,-0.082 0.031,-0.125 0.017,-0.049 0.059,-0.091 0.063,-0.1249 0.005,-0.045 -0.027,-0.095 -0.063,-0.125 -0.11098,0.01 -0.18697,0 -0.24997,0.031 -0.14398,0.066 -0.10598,0.2659 -0.24997,0.3129 -0.05,0.016 -0.13298,0.021 -0.18797,0.031 -0.047,0.01 -0.10699,0.032 -0.15598,0.031 -0.058,-0.001 -0.15298,-0.057 -0.18798,-0.094 -0.009,-0.01 -0.024,-0.036 -0.031,-0.063 0.002,-0.01 -0.002,-0.021 0,-0.031 0.046,-0.2229 0.093,-0.4438 0.15598,-0.6557 0.003,-0.01 -0.003,-0.022 0,-0.031 0.042,-0.1389 0.10298,-0.2699 0.15598,-0.4058 0.013,-0.01 0.019,-0.023 0.031,-0.031 0.077,-0.053 0.15598,-0.1189 0.24997,-0.1249 0.057,0 0.16398,0.02 0.21897,0.031 0.05,0.01 0.082,0.059 0.12499,0.063 0.12298,0.01 0.14898,-0.1029 0.24997,-0.1559 0.10398,0.015 0.15598,-0.01 0.24996,0 0.064,0.01 0.13799,0.09 0.18798,0.094 0.042,0 0.053,-0.069 0.094,-0.063 0.04,0.01 0.11898,0.1079 0.12498,0.1559 0.007,0.06 -0.048,0.122 -0.031,0.1879 0.063,0.064 0.19097,0.056 0.28096,0.094 0.059,-0.048 0.009,-0.118 0,-0.1879 -0.002,-0.031 0.004,-0.066 0,-0.094 -0.006,-0.048 -0.031,-0.084 -0.031,-0.1249 -0.001,-0.1899 0.15398,-0.2999 0.28096,-0.3749 0.055,-0.033 0.10799,-0.069 0.15598,-0.094 0.067,-0.034 0.1,-0.063 0.15598,-0.094 0.10099,-0.057 0.20198,-0.092 0.28097,-0.1559 0.037,-0.086 -0.004,-0.1959 0,-0.2809 0.037,-0.022 0.055,0 0.094,0 0.061,-0.013 0.09,-0.091 0.12499,-0.1249 0.02,-0.02 0.069,-0.043 0.094,-0.063 0.061,-0.048 0.072,-0.104 0.12498,-0.125 0.019,-0.01 0.064,-0.017 0.094,-0.031 0.04,-0.011 0.092,-0.04 0.15598,-0.063 0.042,-0.014 0.13998,-0.015 0.15598,-0.031 0.02,-0.02 -0.006,-0.095 0,-0.1249 0.032,-0.151 0.27196,-0.168 0.40595,-0.2189 0.094,-0.036 0.17798,-0.114 0.28096,-0.094 -0.02,0.072 -0.10998,0.038 -0.094,0.1249 0.023,0.121 0.17598,-0.013 0.21898,-0.031 0.081,-0.034 0.23697,-0.055 0.34395,-0.094 0.094,-0.034 0.24497,-0.08 0.15598,-0.1879 -0.074,0 -0.092,0.066 -0.15598,0.094 -0.044,0.01 -0.056,-0.027 -0.094,-0.031 -0.036,0 -0.057,0.038 -0.094,0.031 -0.037,-0.01 -0.088,-0.082 -0.094,-0.1249 -0.015,-0.111 0.10999,-0.136 0.15598,-0.2189 -0.03,-0.101 -0.16598,-0.024 -0.24997,-0.063 0.009,-0.06 0.055,-0.1139 0.12499,-0.1249 0.057,-0.01 0.18497,0.01 0.21897,0.031 0.02,0.017 0,0.066 0.031,0.094 0.034,0.031 0.081,0.01 0.12499,0 0.016,-0.076 -0.10599,-0.043 -0.094,-0.094 0.09,-0.059 0.26497,-0.016 0.37495,-0.031 0.063,-0.01 0.13099,-0.062 0.18798,-0.094 0.054,-0.03 0.099,-0.081 0.15598,-0.031 0.016,0.054 -0.032,0.066 -0.063,0.094 -0.10199,0.091 -0.20198,0.2069 -0.28097,0.3128 0.049,0.048 0.13599,0.022 0.21898,0.031 0.032,0 0.06,0.025 0.094,0.031 0.04,0.01 0.094,-0.012 0.12499,0 0.056,0.014 0.07,0.094 0.12498,0.094 0.091,0 0.083,-0.125 0.031,-0.1879 0.016,-0.063 0.053,-0.08 0.031,-0.125 -0.041,-0.082 -0.21097,0.014 -0.21897,-0.094 -0.005,-0.067 0.07,-0.075 0.094,-0.125 -0.011,-0.1289 0.10598,-0.1349 0.094,-0.2499 -0.006,-0.048 -0.06,-0.049 -0.094,-0.094 -0.017,-0.023 -0.01,-0.076 -0.031,-0.094 -0.07,-0.059 -0.20997,-0.044 -0.21897,-0.1559 -0.004,-0.066 0.01,-0.115 0,-0.1879 -0.009,-0.067 -0.066,-0.2679 -0.12498,-0.2809 -0.075,-0.016 -0.12899,0.1139 -0.21898,0.1559 -0.049,0.023 -0.13898,0.04 -0.18797,0.031 -0.032,-0.01 -0.089,-0.032 -0.094,-0.094 -0.006,-0.07 0.05,-0.082 0.063,-0.1558 -0.011,-0.044 -0.051,-0.029 -0.094,-0.063 -0.049,-0.037 -0.091,-0.1159 -0.15598,-0.1249 -0.033,0 -0.093,0.029 -0.12498,0.031 -0.06,0 -0.10599,-0.015 -0.15598,-0.031 0.021,-0.01 0.041,-0.024 0.063,-0.031 0.12198,-0.042 0.24997,-0.059 0.37495,-0.094 0.022,-0.01 0.041,-0.025 0.063,-0.031 0.031,0.033 0.056,0.1029 0.094,0.1249 0.025,0.014 0.063,-0.01 0.094,0 0.098,0.03 0.17398,0.085 0.28097,0.063 0.037,-0.065 -0.074,-0.074 -0.031,-0.125 0.072,0.01 0.13198,0.04 0.18798,0.063 0.077,-0.056 0.12798,-0.066 0.12498,-0.1559 -10e-4,-0.046 -0.062,-0.063 -0.094,-0.094 0.063,-0.011 0.12399,-0.022 0.18798,-0.031 0.005,0.017 0.021,0.03 0.031,0.031 0.038,0.01 0.16498,-0.051 0.18797,-0.063 0.004,0 -0.006,-0.027 0,-0.031 0.25297,-0.027 0.52094,-0.031 0.7809,-0.031 m -2.49968,0.4688 c -0.023,0.043 -0.047,0.079 -0.094,0.094 0.012,0.065 -0.084,0.1049 -0.094,0.1558 -0.006,0.035 -0.002,0.094 0,0.125 0.02,0.3189 -0.25096,0.4768 -0.56293,0.4688 -0.061,0.058 -0.029,0.1699 -0.063,0.2499 -0.028,0.067 -0.11998,0.1309 -0.18797,0.1249 -0.05,0 -0.12499,-0.079 -0.12499,-0.1249 0,-0.057 0.081,-0.091 0.031,-0.156 0.007,-0.044 0.10598,-0.086 0.094,-0.1559 -0.012,-0.074 -0.096,-0.019 -0.18798,-0.031 -0.052,-0.01 -0.13298,-0.037 -0.18798,-0.063 0.10099,-0.067 0.20498,-0.126 0.31296,-0.188 0.094,-0.056 0.18498,-0.1049 0.28097,-0.1559 0.25197,-0.1269 0.52193,-0.2438 0.7809,-0.3437 m 5.37432,0.7495 c -0.027,0 -0.04,0.018 -0.063,0.031 -0.051,0.031 -0.054,0.079 -0.094,0.094 -0.054,0.021 -0.11698,0.01 -0.12498,0.063 -0.006,0.041 0.033,0.055 0.031,0.094 -0.02,0.049 -0.053,0.066 -0.063,0.1249 0.068,0.11 0.22897,-0.01 0.31296,-0.031 0.038,-0.011 0.073,0 0.094,-0.031 0.023,-0.035 0.013,-0.105 0.031,-0.156 0.019,-0.056 0.069,-0.043 0.063,-0.094 -0.006,-0.05 -0.10599,-0.102 -0.18797,-0.094 m -7.31208,0.7807 c 0.061,0.016 0.19597,0.1929 0.063,0.2499 -0.013,0.01 -0.18698,0.036 -0.21897,0.031 -0.046,-0.01 -0.078,-0.086 -0.12499,-0.094 -0.092,-0.016 -0.21797,0.101 -0.28096,0 0.016,-0.059 0.086,-0.043 0.15598,-0.063 0.12498,-0.034 0.29796,-0.1529 0.40595,-0.1249 m 0.24996,0.3128 c 0.031,0 0.056,0.059 0.094,0.063 0.036,0 0.072,-0.036 0.094,-0.031 0.056,0.015 0.084,0.115 0.031,0.156 -0.044,0 -0.061,-0.037 -0.094,-0.031 -0.091,0.016 -0.11999,0.1929 -0.18798,0.1879 -0.064,-0.01 -0.096,-0.1409 -0.031,-0.1879 0.002,-0.04 -0.033,-0.054 -0.031,-0.094 0.02,-0.025 0.072,-0.066 0.12498,-0.063 m -0.31296,0.031 c 0.019,0.001 0.024,0 0.031,0 -0.009,0.071 -0.039,0.091 -0.094,0.125 -0.095,0.057 -0.15698,0.1279 -0.18797,0.2499 -0.009,0.036 -0.11099,0.1339 -0.15598,0.1249 -0.10599,-0.022 0.038,-0.2199 0.063,-0.2499 0.027,-0.033 0.062,-0.056 0.094,-0.094 0.03,-0.037 0.033,-0.105 0.063,-0.125 0.032,-0.022 0.13198,-0.033 0.18797,-0.031 m 9.49881,0.031 c 0.048,0.013 0.058,0.069 0.094,0.094 0.027,0.018 0.064,0.012 0.094,0.031 0.035,0.022 0.054,0.06 0.094,0.094 0.056,0.047 0.13998,0.088 0.21897,0.125 0.016,0.01 0.044,0.023 0.063,0.031 0.055,0.071 0.10399,0.1449 0.15598,0.2189 0.006,0.04 0.012,0.099 0.031,0.1249 0.052,0.071 0.13098,0.1319 0.18798,0.2189 -10e-4,0.083 0.036,0.133 0.094,0.1559 0.073,0.124 0.14898,0.2479 0.21897,0.3748 0.029,0.058 0.035,0.1289 0.063,0.1879 -0.021,0 -0.043,0.01 -0.063,0 -0.066,-0.116 -0.40895,-0.1389 -0.43795,0.031 -0.013,0.075 0.049,0.1749 -0.063,0.1879 -0.071,0.01 -0.15298,-0.073 -0.24997,-0.094 -0.04,-0.01 -0.094,0.014 -0.12498,0 -0.073,-0.025 -0.062,-0.1119 -0.12498,-0.1559 -0.036,-0.025 -0.12999,-0.056 -0.18798,-0.063 -0.036,0 -0.056,0 -0.094,0 -0.045,-0.01 -0.11798,-0.01 -0.15598,-0.031 -0.036,-0.022 -0.11599,-0.062 -0.12498,-0.094 -0.014,-0.049 0.09,-0.1139 0.094,-0.1558 0.002,-0.031 -0.023,-0.045 -0.031,-0.094 -0.005,-0.029 0.006,-0.074 0,-0.094 -0.01,-0.034 -0.071,-0.062 -0.12499,-0.063 -0.048,0 -0.084,0.03 -0.12498,0.031 -0.059,0.001 -0.17698,-0.037 -0.24997,-0.031 -0.044,0 -0.084,0.028 -0.12499,0.031 -0.11598,0.01 -0.19097,-0.01 -0.28096,0 -0.066,0 -0.18898,0.034 -0.24997,0.063 -0.031,0.014 -0.054,0.043 -0.094,0.063 -0.018,0.01 -0.039,0.021 -0.063,0.031 -0.038,0.017 -0.089,0.053 -0.12498,0.063 -0.052,0.013 -0.12399,0 -0.21898,0 -0.068,0 -0.18697,-0.014 -0.18797,-0.094 -10e-4,-0.1229 0.22697,-0.072 0.34396,-0.094 0.044,-0.01 0.073,-0.063 0.12498,-0.094 0.025,-0.015 0.039,-0.015 0.063,-0.031 0.04,-0.028 0.11898,-0.093 0.12498,-0.1249 0.006,-0.03 -0.035,-0.072 -0.031,-0.094 0.005,-0.028 0.057,-0.058 0.094,-0.094 0.056,-0.055 0.087,-0.1199 0.15598,-0.1559 0.047,-0.025 0.13499,-0.024 0.15599,-0.063 0.005,-0.043 -0.001,-0.055 0,-0.094 0.029,-0.027 0.038,-0.058 0.063,-0.063 0.072,-0.016 0.13498,0.035 0.21897,0.031 0.036,0 0.086,-0.01 0.12498,-0.031 0.033,-0.022 0.062,-0.045 0.094,-0.063 0.035,-0.018 0.051,-0.059 0.094,-0.063 0.10499,-0.01 0.17098,0.1239 0.21897,0.1879 0.04,0.053 0.15299,0.1189 0.21898,0.1559 0.037,0.021 0.084,0.045 0.12498,0.063 0.087,0.039 0.24697,0.1649 0.24997,0.2499 0.002,0.042 -0.038,0.054 -0.031,0.094 0.066,0.011 0.12298,-0.059 0.12498,-0.1249 0.001,-0.041 -0.039,-0.05 -0.031,-0.094 0.031,-0.066 0.14798,-0.01 0.18798,-0.031 -0.007,-0.075 -0.12398,-0.086 -0.18798,-0.1249 -0.034,-0.021 -0.058,-0.048 -0.094,-0.063 -0.052,-0.021 -0.11598,-0.032 -0.15598,-0.063 -0.038,-0.029 -0.057,-0.08 -0.094,-0.1249 -0.054,-0.064 -0.15798,-0.073 -0.12498,-0.2189 0.016,-0.022 0.037,-0.069 0.063,-0.063 m -8.81189,0.2189 0.094,0 c 0.034,10e-4 0.08,-0.018 0.094,0 -0.022,0.088 -0.21197,0.063 -0.28096,0.031 0.004,-0.033 0.05,-0.027 0.094,-0.031 m -0.31296,0.156 c 0.023,0 0.039,-0.01 0.063,0 -0.062,0.052 -0.14398,0.092 -0.24997,0.1249 -0.051,0.016 -0.11598,0.025 -0.12498,-0.031 -0.011,-0.069 0.047,-0.056 0.094,-0.063 0.058,-0.01 0.14999,-0.029 0.21898,-0.031 m 8.6869,0 c -0.043,0.014 -0.066,0.1129 0,0.1249 0.031,-0.018 0.039,-0.068 0.031,-0.1249 -0.017,-0.018 -0.017,0 -0.031,0 m -0.031,0.1879 c -0.021,0.01 -0.04,0.01 -0.063,0.031 10e-4,0.075 0.015,0.1229 0,0.1879 0.043,0.082 0.13398,0.026 0.15598,-0.031 0.026,-0.1389 -0.03,-0.2049 -0.094,-0.1879 m 0.43795,0.3748 c 0.049,0.08 0.14098,0.137 0.24997,0.1559 0.04,-0.03 0.044,-0.1049 0.063,-0.1559 -0.047,10e-4 -0.097,0 -0.15598,0 -0.059,0 -0.12198,-0.028 -0.15598,0 m -11.68652,2.6867 c 0.16398,-0.01 0.21197,0.2159 0.34395,0.2809 0.033,0.017 0.082,0.022 0.12499,0.031 0.035,0.01 0.061,0.02 0.094,0.031 0.071,0.024 0.16198,0.01 0.21897,0.031 0.085,0.038 0.14598,0.2069 0.21897,0.2499 0.004,0.043 -0.013,0.093 0,0.1249 0.035,0.047 0.099,0.064 0.15598,0.094 0.068,0.037 0.092,0.1269 0.15598,0.1559 0.022,0.01 0.059,-0.01 0.094,0 0.088,0.027 0.11199,0.1468 0.18798,0.1248 0.05,-0.014 0.055,-0.078 0.063,-0.1248 0.033,-0.036 0.074,-0.093 0.12498,-0.094 0.083,0 0.095,0.075 0.12499,0.1559 0.017,0.046 0.051,0.1079 0.063,0.1559 0.021,0.083 0.017,0.3249 0,0.3748 -0.021,0.061 -0.10599,0.089 -0.15598,0.156 -0.024,0.031 -0.044,0.071 -0.063,0.094 -0.032,0.04 -0.069,0.057 -0.094,0.094 -0.014,0.021 -0.018,0.066 -0.031,0.094 -0.04,0.085 -0.096,0.148 -0.063,0.2499 0.014,0.042 0.062,0.076 0.063,0.125 0,0.058 -0.11498,0.093 -0.12498,0.1559 -0.007,0.047 0.048,0.126 0.063,0.1879 0.011,0.047 0.097,0.094 0.12498,0.125 0.047,0.053 0.082,0.1209 0.12499,0.1879 0.085,0.1299 0.13598,0.2799 0.21897,0.4058 0.043,0.066 0.12698,0.119 0.15598,0.1879 0.015,0.035 -0.014,0.094 0,0.125 0.048,0.1079 0.26597,0.2279 0.37495,0.2809 0.051,0.025 0.10999,0 0.15598,0.031 0.071,0.039 0.21398,0.1569 0.24997,0.2189 0.032,0.056 0.047,0.1929 0.063,0.2808 0.021,0.117 -0.005,0.2169 0,0.3439 0.004,0.069 0.03,0.1189 0.031,0.1879 0,0.024 10e-4,0.07 0,0.094 -0.002,0.083 0.007,0.1659 0,0.2498 -0.004,0.046 -0.003,0.087 0,0.125 0.004,0.041 0.028,0.057 0.031,0.094 0.002,0.039 -0.035,0.095 -0.031,0.125 0.009,0.084 0.077,0.1419 0.094,0.2189 0.013,0.061 0.039,0.2079 0.031,0.2809 -0.005,0.039 -0.025,0.083 -0.031,0.1249 -0.004,0.033 0.005,0.062 0,0.094 -0.006,0.047 -0.034,0.081 -0.031,0.1249 0.006,0.09 0.08,0.16 0.094,0.2499 0.005,0.03 -10e-4,0.065 0,0.094 0.001,0.027 0.023,0.038 0.031,0.063 -0.26297,-0.1499 -0.50894,-0.3178 -0.74991,-0.4997 -0.22897,-0.173 -0.45094,-0.3639 -0.65592,-0.5628 -0.01,-0.01 -0.021,-0.021 -0.031,-0.031 -0.20698,-0.2039 -0.41395,-0.4278 -0.59393,-0.6557 -0.10398,-0.1319 -0.21797,-0.2669 -0.31296,-0.4058 -0.056,-0.083 -0.10399,-0.1639 -0.15598,-0.2499 -0.032,-0.051 -0.063,-0.104 -0.094,-0.1559 -0.089,-0.153 -0.17297,-0.3078 -0.24997,-0.4687 -0.049,-0.101 -0.081,-0.2079 -0.12498,-0.3129 -0.10499,-0.2479 -0.20497,-0.4888 -0.28096,-0.7497 -0.054,-0.1849 -0.086,-0.3708 -0.12499,-0.5627 -0.03,-0.146 -0.073,-0.2889 -0.094,-0.4378 -0.011,-0.081 -0.023,-0.168 -0.031,-0.2499 -0.024,-0.2349 -0.031,-0.4768 -0.031,-0.7186 0,-0.3019 0.026,-0.5837 0.063,-0.8746 10e-4,-0.01 -10e-4,-0.021 0,-0.031 0.063,0 0.14899,-0.092 0.21898,-0.094 m 2.68766,0.7497 c 0.064,-0.029 0.084,0.117 0.031,0.125 -0.05,0.01 -0.08,-0.102 -0.031,-0.125"
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#4d4d4d;fill-opacity:1" />
+    <rect
+       style="fill:#16907d;fill-opacity:1;stroke:none"
+       id="rect4035-8"
+       width="0"
+       height="10.999983"
+       x="293.00085"
+       y="543.62817" />
+    <rect
+       style="fill:#6c7a89;fill-opacity:1;stroke:none"
+       id="rect4035-0"
+       width="0"
+       height="10.999983"
+       x="294.37088"
+       y="542.8327" />
+  </g>
+</svg>
diff --git a/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/files.cmake b/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/files.cmake
new file mode 100644
index 000000000..3ddaa9a0e
--- /dev/null
+++ b/src/plugins/forms/widgets/webbrowser/pics/icons/breeze/files.cmake
@@ -0,0 +1,14 @@
+# List of project's own icon files
+# This file is generated by update_icon_list.sh
+# WARNING! All changes made in this file will be lost!
+
+set(_PNG_FILES
+)
+
+set(_SVG_FILES
+icons/breeze/actions/16/kexiform-web-browser.svg
+icons/breeze/actions/22/kexiform-web-browser.svg
+icons/breeze/actions/24/kexiform-web-browser.svg
+)
+
+set(_FILES ${_PNG_FILES} ${_SVG_FILES})